arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-42: Add Python tests to Travis CI build
Date Wed, 09 Mar 2016 04:29:07 GMT
Repository: arrow
Updated Branches:
  refs/heads/master e822ea758 -> 83675273b


ARROW-42: Add Python tests to Travis CI build

Author: Wes McKinney <wesm@apache.org>

Closes #22 from wesm/ARROW-42 and squashes the following commits:

3b056a1 [Wes McKinney] Modularize Travis CI build and add Python build script. Remove parquet.pyx
from Cython build for now, suppress -Wunused-variable in Cython compilation. Add missing formatting.py
file


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/83675273
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/83675273
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/83675273

Branch: refs/heads/master
Commit: 83675273bd2057552ae64b7d8632a54093a02ed9
Parents: e822ea7
Author: Wes McKinney <wesm@apache.org>
Authored: Tue Mar 8 20:28:58 2016 -0800
Committer: Wes McKinney <wesm@apache.org>
Committed: Tue Mar 8 20:28:58 2016 -0800

----------------------------------------------------------------------
 .travis.yml                            | 23 +++++++++++
 ci/travis_before_script_cpp.sh         | 26 +++++++++++++
 ci/travis_script_cpp.sh                | 22 +----------
 ci/travis_script_python.sh             | 59 +++++++++++++++++++++++++++++
 cpp/src/arrow/table/column-test.cc     |  2 +
 cpp/src/arrow/table/schema-test.cc     |  2 +
 cpp/src/arrow/table/table-test.cc      |  4 ++
 cpp/src/arrow/type.cc                  | 14 -------
 cpp/src/arrow/type.h                   | 14 -------
 python/CMakeLists.txt                  |  2 -
 python/arrow/formatting.py             | 56 +++++++++++++++++++++++++++
 python/cmake_modules/UseCython.cmake   |  5 +++
 python/requirements.txt                |  4 ++
 python/setup.py                        |  2 +-
 python/src/pyarrow/adapters/builtin.cc | 20 ++++++----
 python/src/pyarrow/adapters/builtin.h  |  2 +
 python/src/pyarrow/helpers.cc          | 14 +++++++
 python/src/pyarrow/helpers.h           | 14 +++++++
 python/src/pyarrow/util/CMakeLists.txt | 18 +--------
 19 files changed, 228 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index cb2d5cb..9e858d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,9 @@ addons:
     packages:
     - gcc-4.9   # Needed for C++11
     - g++-4.9   # Needed for C++11
+    - gdb
     - gcov
+    - ccache
     - cmake
     - valgrind
 
@@ -17,11 +19,32 @@ matrix:
   - compiler: gcc
     language: cpp
     os: linux
+    before_script:
+    - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
     script:
+    - export CC="gcc-4.9"
+    - export CXX="g++-4.9"
     - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
+    - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
   - compiler: clang
     language: cpp
     os: osx
     addons:
+    before_script:
+    - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
+    - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
+
+before_install:
+- ulimit -c unlimited -S
+- export CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build
+- export ARROW_CPP_INSTALL=$TRAVIS_BUILD_DIR/cpp-install
+- export LD_LIBRARY_PATH=$ARROW_CPP_INSTALL/lib:$LD_LIBRARY_PATH
+
+after_script:
+- rm -rf $CPP_BUILD_DIR
+
+after_failure:
+- COREFILE=$(find . -maxdepth 2 -name "core*" | head -n 1)
+- if [[ -f "$COREFILE" ]]; then gdb -c "$COREFILE" example -ex "thread apply all bt" -ex
"set pagination 0" -batch; fi

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/ci/travis_before_script_cpp.sh
----------------------------------------------------------------------
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
new file mode 100755
index 0000000..4d5bef8
--- /dev/null
+++ b/ci/travis_before_script_cpp.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+
+: ${CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build}
+
+mkdir $CPP_BUILD_DIR
+pushd $CPP_BUILD_DIR
+
+CPP_DIR=$TRAVIS_BUILD_DIR/cpp
+
+# Build an isolated thirdparty
+cp -r $CPP_DIR/thirdparty .
+cp $CPP_DIR/setup_build_env.sh .
+
+source setup_build_env.sh
+
+echo $GTEST_HOME
+
+: ${ARROW_CPP_INSTALL=$TRAVIS_BUILD_DIR/cpp-install}
+
+cmake -DCMAKE_INSTALL_PREFIX=$ARROW_CPP_INSTALL -DCMAKE_CXX_FLAGS="-Werror" $CPP_DIR
+make -j4
+make install
+
+popd

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/ci/travis_script_cpp.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_cpp.sh b/ci/travis_script_cpp.sh
index 28f16cc..3e843dd 100755
--- a/ci/travis_script_cpp.sh
+++ b/ci/travis_script_cpp.sh
@@ -2,28 +2,11 @@
 
 set -e
 
-mkdir $TRAVIS_BUILD_DIR/cpp-build
-pushd $TRAVIS_BUILD_DIR/cpp-build
+: ${CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build}
 
-CPP_DIR=$TRAVIS_BUILD_DIR/cpp
+pushd $CPP_BUILD_DIR
 
-# Build an isolated thirdparty
-cp -r $CPP_DIR/thirdparty .
-cp $CPP_DIR/setup_build_env.sh .
-
-if [ $TRAVIS_OS_NAME == "linux" ]; then
-  # Use a C++11 compiler on Linux
-  export CC="gcc-4.9"
-  export CXX="g++-4.9"
-fi
-
-source setup_build_env.sh
-
-echo $GTEST_HOME
-
-cmake -DCMAKE_CXX_FLAGS="-Werror" $CPP_DIR
 make lint
-make -j4
 
 if [ $TRAVIS_OS_NAME == "linux" ]; then
   valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ctest
@@ -32,4 +15,3 @@ else
 fi
 
 popd
-rm -rf cpp-build

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/ci/travis_script_python.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
new file mode 100755
index 0000000..9b0bd4f
--- /dev/null
+++ b/ci/travis_script_python.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -e
+
+PYTHON_DIR=$TRAVIS_BUILD_DIR/python
+
+# Share environment with C++
+pushd $CPP_BUILD_DIR
+source setup_build_env.sh
+popd
+
+pushd $PYTHON_DIR
+
+# Bootstrap a Conda Python environment
+
+if [ $TRAVIS_OS_NAME == "linux" ]; then
+  MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh"
+else
+  MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh"
+fi
+
+curl $MINICONDA_URL > miniconda.sh
+MINICONDA=$TRAVIS_BUILD_DIR/miniconda
+bash miniconda.sh -b -p $MINICONDA
+export PATH="$MINICONDA/bin:$PATH"
+conda update -y -q conda
+conda info -a
+
+PYTHON_VERSION=3.5
+CONDA_ENV_NAME=pyarrow-test
+
+conda create -y -q -n $CONDA_ENV_NAME python=$PYTHON_VERSION
+source activate $CONDA_ENV_NAME
+
+python --version
+which python
+
+# faster builds, please
+conda install -y nomkl
+
+# Expensive dependencies install from Continuum package repo
+conda install -y pip numpy pandas cython
+
+# Other stuff pip install
+pip install -r requirements.txt
+
+export ARROW_HOME=$ARROW_CPP_INSTALL
+
+python setup.py build_ext --inplace
+
+py.test -vv -r sxX arrow
+
+# if [ $TRAVIS_OS_NAME == "linux" ]; then
+#   valgrind --tool=memcheck py.test -vv -r sxX arrow
+# else
+#   py.test -vv -r sxX arrow
+# fi
+
+popd

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/cpp/src/arrow/table/column-test.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/table/column-test.cc b/cpp/src/arrow/table/column-test.cc
index bf95932..3b102e4 100644
--- a/cpp/src/arrow/table/column-test.cc
+++ b/cpp/src/arrow/table/column-test.cc
@@ -33,6 +33,8 @@ using std::vector;
 
 namespace arrow {
 
+const auto INT32 = std::make_shared<Int32Type>();
+
 class TestColumn : public TestBase {
  protected:
   std::shared_ptr<ChunkedArray> data_;

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/cpp/src/arrow/table/schema-test.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/table/schema-test.cc b/cpp/src/arrow/table/schema-test.cc
index d6725cc..9dfade2 100644
--- a/cpp/src/arrow/table/schema-test.cc
+++ b/cpp/src/arrow/table/schema-test.cc
@@ -29,6 +29,8 @@ using std::vector;
 
 namespace arrow {
 
+const auto INT32 = std::make_shared<Int32Type>();
+
 TEST(TestField, Basics) {
   shared_ptr<DataType> ftype = INT32;
   shared_ptr<DataType> ftype_nn = std::make_shared<Int32Type>(false);

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/cpp/src/arrow/table/table-test.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/table/table-test.cc b/cpp/src/arrow/table/table-test.cc
index c4fdb06..8b354e8 100644
--- a/cpp/src/arrow/table/table-test.cc
+++ b/cpp/src/arrow/table/table-test.cc
@@ -34,6 +34,10 @@ using std::vector;
 
 namespace arrow {
 
+const auto INT16 = std::make_shared<Int16Type>();
+const auto UINT8 = std::make_shared<UInt8Type>();
+const auto INT32 = std::make_shared<Int32Type>();
+
 class TestTable : public TestBase {
  public:
   void MakeExample1(int length) {

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/cpp/src/arrow/type.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/type.cc b/cpp/src/arrow/type.cc
index 2657708..0a2e817 100644
--- a/cpp/src/arrow/type.cc
+++ b/cpp/src/arrow/type.cc
@@ -66,18 +66,4 @@ std::string StructType::ToString() const {
   return s.str();
 }
 
-const std::shared_ptr<NullType> NA = std::make_shared<NullType>();
-const std::shared_ptr<BooleanType> BOOL = std::make_shared<BooleanType>();
-const std::shared_ptr<UInt8Type> UINT8 = std::make_shared<UInt8Type>();
-const std::shared_ptr<UInt16Type> UINT16 = std::make_shared<UInt16Type>();
-const std::shared_ptr<UInt32Type> UINT32 = std::make_shared<UInt32Type>();
-const std::shared_ptr<UInt64Type> UINT64 = std::make_shared<UInt64Type>();
-const std::shared_ptr<Int8Type> INT8 = std::make_shared<Int8Type>();
-const std::shared_ptr<Int16Type> INT16 = std::make_shared<Int16Type>();
-const std::shared_ptr<Int32Type> INT32 = std::make_shared<Int32Type>();
-const std::shared_ptr<Int64Type> INT64 = std::make_shared<Int64Type>();
-const std::shared_ptr<FloatType> FLOAT = std::make_shared<FloatType>();
-const std::shared_ptr<DoubleType> DOUBLE = std::make_shared<DoubleType>();
-const std::shared_ptr<StringType> STRING = std::make_shared<StringType>();
-
 } // namespace arrow

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/cpp/src/arrow/type.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/type.h b/cpp/src/arrow/type.h
index e78e494..00b01ea 100644
--- a/cpp/src/arrow/type.h
+++ b/cpp/src/arrow/type.h
@@ -338,20 +338,6 @@ struct StructType : public DataType {
   std::string ToString() const override;
 };
 
-extern const std::shared_ptr<NullType> NA;
-extern const std::shared_ptr<BooleanType> BOOL;
-extern const std::shared_ptr<UInt8Type> UINT8;
-extern const std::shared_ptr<UInt16Type> UINT16;
-extern const std::shared_ptr<UInt32Type> UINT32;
-extern const std::shared_ptr<UInt64Type> UINT64;
-extern const std::shared_ptr<Int8Type> INT8;
-extern const std::shared_ptr<Int16Type> INT16;
-extern const std::shared_ptr<Int32Type> INT32;
-extern const std::shared_ptr<Int64Type> INT64;
-extern const std::shared_ptr<FloatType> FLOAT;
-extern const std::shared_ptr<DoubleType> DOUBLE;
-extern const std::shared_ptr<StringType> STRING;
-
 } // namespace arrow
 
 #endif  // ARROW_TYPE_H

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 8fdd829..8f5c27b 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -404,7 +404,6 @@ set(PYARROW_SRCS
 )
 
 set(LINK_LIBS
-  pyarrow_util
   arrow
 )
 
@@ -428,7 +427,6 @@ set(CYTHON_EXTENSIONS
   array
   config
   error
-  parquet
   scalar
   schema
 )

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/arrow/formatting.py
----------------------------------------------------------------------
diff --git a/python/arrow/formatting.py b/python/arrow/formatting.py
new file mode 100644
index 0000000..a42d4e4
--- /dev/null
+++ b/python/arrow/formatting.py
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Pretty-printing and other formatting utilities for Arrow data structures
+
+import arrow.scalar as scalar
+
+
+def array_format(arr, window=None):
+    values = []
+
+    if window is None or window * 2 >= len(arr):
+        for x in arr:
+            values.append(value_format(x, 0))
+        contents = _indent(',\n'.join(values), 2)
+    else:
+        for i in range(window):
+            values.append(value_format(arr[i], 0) + ',')
+        values.append('...')
+        for i in range(len(arr) - window, len(arr)):
+            formatted = value_format(arr[i], 0)
+            if i < len(arr) - 1:
+                formatted += ','
+            values.append(formatted)
+        contents = _indent('\n'.join(values), 2)
+
+    return '[\n{0}\n]'.format(contents)
+
+
+def value_format(x, indent_level=0):
+    if isinstance(x, scalar.ListValue):
+        contents = ',\n'.join(value_format(item) for item in x)
+        return '[{0}]'.format(_indent(contents, 1).strip())
+    else:
+        return repr(x)
+
+
+def _indent(text, spaces):
+    if spaces == 0:
+        return text
+    block = ' ' * spaces
+    return '\n'.join(block + x for x in text.split('\n'))

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/cmake_modules/UseCython.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/UseCython.cmake b/python/cmake_modules/UseCython.cmake
index e7034db..3b1c201 100644
--- a/python/cmake_modules/UseCython.cmake
+++ b/python/cmake_modules/UseCython.cmake
@@ -121,6 +121,11 @@ function( compile_pyx _name pyx_target_name generated_files pyx_file)
       set( _generated_files "${_name}.${extension}")
   endif()
   set_source_files_properties( ${_generated_files} PROPERTIES GENERATED TRUE )
+
+  # Cython creates a lot of compiler warning detritus on clang
+  set_source_files_properties(${_generated_files} PROPERTIES
+    COMPILE_FLAGS -Wno-unused-function)
+
   set( ${generated_files} ${_generated_files} PARENT_SCOPE )
 
   # Add the command to run the compiler.

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/requirements.txt
----------------------------------------------------------------------
diff --git a/python/requirements.txt b/python/requirements.txt
new file mode 100644
index 0000000..a82cb20
--- /dev/null
+++ b/python/requirements.txt
@@ -0,0 +1,4 @@
+pytest
+numpy>=1.7.0
+pandas>=0.12.0
+six

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/setup.py
----------------------------------------------------------------------
diff --git a/python/setup.py b/python/setup.py
index 9a0de07..eb3ff2a 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -210,7 +210,7 @@ class build_ext(_build_ext):
             return name + suffix
 
     def get_cmake_cython_names(self):
-        return ['array', 'config', 'error', 'parquet', 'scalar', 'schema']
+        return ['array', 'config', 'error', 'scalar', 'schema']
 
     def get_names(self):
         return self._found_names

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/src/pyarrow/adapters/builtin.cc
----------------------------------------------------------------------
diff --git a/python/src/pyarrow/adapters/builtin.cc b/python/src/pyarrow/adapters/builtin.cc
index 60d6248..bb79052 100644
--- a/python/src/pyarrow/adapters/builtin.cc
+++ b/python/src/pyarrow/adapters/builtin.cc
@@ -22,6 +22,7 @@
 
 #include <arrow/api.h>
 
+#include "pyarrow/helpers.h"
 #include "pyarrow/status.h"
 
 using arrow::ArrayBuilder;
@@ -74,16 +75,16 @@ class ScalarVisitor {
   std::shared_ptr<DataType> GetType() {
     // TODO(wesm): handling mixed-type cases
     if (float_count_) {
-      return arrow::DOUBLE;
+      return DOUBLE;
     } else if (int_count_) {
       // TODO(wesm): tighter type later
-      return arrow::INT64;
+      return INT64;
     } else if (bool_count_) {
-      return arrow::BOOL;
+      return BOOL;
     } else if (string_count_) {
-      return arrow::STRING;
+      return STRING;
     } else {
-      return arrow::NA;
+      return NA;
     }
   }
 
@@ -145,7 +146,7 @@ class SeqVisitor {
   std::shared_ptr<DataType> GetType() {
     if (scalars_.total_count() == 0) {
       if (max_nesting_level_ == 0) {
-        return arrow::NA;
+        return NA;
       } else {
         return nullptr;
       }
@@ -209,7 +210,7 @@ static Status InferArrowType(PyObject* obj, int64_t* size,
 
   // For 0-length sequences, refuse to guess
   if (*size == 0) {
-    *out_type = arrow::NA;
+    *out_type = NA;
   }
 
   SeqVisitor seq_visitor;
@@ -217,6 +218,11 @@ static Status InferArrowType(PyObject* obj, int64_t* size,
   PY_RETURN_NOT_OK(seq_visitor.Validate());
 
   *out_type = seq_visitor.GetType();
+
+  if (*out_type == nullptr) {
+    return Status::TypeError("Unable to determine data type");
+  }
+
   return Status::OK();
 }
 

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/src/pyarrow/adapters/builtin.h
----------------------------------------------------------------------
diff --git a/python/src/pyarrow/adapters/builtin.h b/python/src/pyarrow/adapters/builtin.h
index 24886f4..88869c2 100644
--- a/python/src/pyarrow/adapters/builtin.h
+++ b/python/src/pyarrow/adapters/builtin.h
@@ -25,6 +25,8 @@
 
 #include <memory>
 
+#include <arrow/type.h>
+
 #include "pyarrow/common.h"
 
 namespace arrow { class Array; }

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/src/pyarrow/helpers.cc
----------------------------------------------------------------------
diff --git a/python/src/pyarrow/helpers.cc b/python/src/pyarrow/helpers.cc
index d0969da..0921fc4 100644
--- a/python/src/pyarrow/helpers.cc
+++ b/python/src/pyarrow/helpers.cc
@@ -23,6 +23,20 @@ using namespace arrow;
 
 namespace pyarrow {
 
+const std::shared_ptr<NullType> NA = std::make_shared<NullType>();
+const std::shared_ptr<BooleanType> BOOL = std::make_shared<BooleanType>();
+const std::shared_ptr<UInt8Type> UINT8 = std::make_shared<UInt8Type>();
+const std::shared_ptr<UInt16Type> UINT16 = std::make_shared<UInt16Type>();
+const std::shared_ptr<UInt32Type> UINT32 = std::make_shared<UInt32Type>();
+const std::shared_ptr<UInt64Type> UINT64 = std::make_shared<UInt64Type>();
+const std::shared_ptr<Int8Type> INT8 = std::make_shared<Int8Type>();
+const std::shared_ptr<Int16Type> INT16 = std::make_shared<Int16Type>();
+const std::shared_ptr<Int32Type> INT32 = std::make_shared<Int32Type>();
+const std::shared_ptr<Int64Type> INT64 = std::make_shared<Int64Type>();
+const std::shared_ptr<FloatType> FLOAT = std::make_shared<FloatType>();
+const std::shared_ptr<DoubleType> DOUBLE = std::make_shared<DoubleType>();
+const std::shared_ptr<StringType> STRING = std::make_shared<StringType>();
+
 #define GET_PRIMITIVE_TYPE(NAME, Type)          \
   case LogicalType::NAME:                       \
     if (nullable) {                             \

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/src/pyarrow/helpers.h
----------------------------------------------------------------------
diff --git a/python/src/pyarrow/helpers.h b/python/src/pyarrow/helpers.h
index 1a24f05..e41568d 100644
--- a/python/src/pyarrow/helpers.h
+++ b/python/src/pyarrow/helpers.h
@@ -26,6 +26,20 @@ namespace pyarrow {
 using arrow::DataType;
 using arrow::LogicalType;
 
+extern const std::shared_ptr<arrow::NullType> NA;
+extern const std::shared_ptr<arrow::BooleanType> BOOL;
+extern const std::shared_ptr<arrow::UInt8Type> UINT8;
+extern const std::shared_ptr<arrow::UInt16Type> UINT16;
+extern const std::shared_ptr<arrow::UInt32Type> UINT32;
+extern const std::shared_ptr<arrow::UInt64Type> UINT64;
+extern const std::shared_ptr<arrow::Int8Type> INT8;
+extern const std::shared_ptr<arrow::Int16Type> INT16;
+extern const std::shared_ptr<arrow::Int32Type> INT32;
+extern const std::shared_ptr<arrow::Int64Type> INT64;
+extern const std::shared_ptr<arrow::FloatType> FLOAT;
+extern const std::shared_ptr<arrow::DoubleType> DOUBLE;
+extern const std::shared_ptr<arrow::StringType> STRING;
+
 std::shared_ptr<DataType> GetPrimitiveType(LogicalType::type type,
     bool nullable);
 

http://git-wip-us.apache.org/repos/asf/arrow/blob/83675273/python/src/pyarrow/util/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/python/src/pyarrow/util/CMakeLists.txt b/python/src/pyarrow/util/CMakeLists.txt
index 60dc80e..3fd8bac 100644
--- a/python/src/pyarrow/util/CMakeLists.txt
+++ b/python/src/pyarrow/util/CMakeLists.txt
@@ -16,22 +16,6 @@
 # under the License.
 
 #######################################
-# pyarrow_util
-#######################################
-
-set(UTIL_SRCS
-)
-
-set(UTIL_LIBS
-)
-
-add_library(pyarrow_util STATIC
-  ${UTIL_SRCS}
-)
-target_link_libraries(pyarrow_util ${UTIL_LIBS})
-SET_TARGET_PROPERTIES(pyarrow_util PROPERTIES LINKER_LANGUAGE CXX)
-
-#######################################
 # pyarrow_test_main
 #######################################
 
@@ -40,7 +24,7 @@ add_library(pyarrow_test_main
 
 if (APPLE)
   target_link_libraries(pyarrow_test_main
-    gmock
+    gtest
     dl)
   set_target_properties(pyarrow_test_main
         PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")


Mime
View raw message