diff --git a/ci/travis_script_manylinux.sh b/ci/travis_script_manylinux.sh index 69feb685b51..4e6be62bd3e 100755 --- a/ci/travis_script_manylinux.sh +++ b/ci/travis_script_manylinux.sh @@ -18,4 +18,4 @@ set -ex pushd python/manylinux1 git clone ../../ arrow docker build -t arrow-base-x86_64 -f Dockerfile-x86_64 . -docker run --rm -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh +docker run --rm -e PYARROW_PARALLEL=3 -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index a9db4d877fb..d8287108d4c 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -246,6 +246,7 @@ endfunction(bundle_arrow_lib) if (PYARROW_BUNDLE_ARROW_CPP) # arrow + file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include) bundle_arrow_lib(ARROW_SHARED_LIB) bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB) endif() diff --git a/python/manylinux1/README.md b/python/manylinux1/README.md index 32af6f31da2..2e7f56bd620 100644 --- a/python/manylinux1/README.md +++ b/python/manylinux1/README.md @@ -32,7 +32,7 @@ git clone ../../ arrow # Build the native baseimage docker build -t arrow-base-x86_64 -f Dockerfile-x86_64 . # Build the python packages -docker run --rm -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh +docker run --rm -t -i -v $PWD:/io arrow-base-x86_64 /io/build_arrow.sh # Now the new packages are located in the dist/ folder ls -l dist/ ``` diff --git a/python/setup.py b/python/setup.py index 1c466170669..148224afb05 100644 --- a/python/setup.py +++ b/python/setup.py @@ -161,14 +161,18 @@ def _run_cmake(self): cmake_command = (['cmake', self.extra_cmake_args] + cmake_options + [source]) + print("-- Runnning cmake for pyarrow") self.spawn(cmake_command) + print("-- Finished cmake for pyarrow") args = ['make'] if os.environ.get('PYARROW_BUILD_VERBOSE', '0') == '1': args.append('VERBOSE=1') if 'PYARROW_PARALLEL' in os.environ: args.append('-j{0}'.format(os.environ['PYARROW_PARALLEL'])) + print("-- Running cmake --build for pyarrow") self.spawn(args) + print("-- Finished cmake --build for pyarrow") else: import shlex cmake_generator = 'Visual Studio 14 2015 Win64' @@ -183,9 +187,13 @@ def _run_cmake(self): if "-G" in self.extra_cmake_args: cmake_command = cmake_command[:-2] + print("-- Runnning cmake for pyarrow") self.spawn(cmake_command) + print("-- Finished cmake for pyarrow") # Do the build + print("-- Running cmake --build for pyarrow") self.spawn(['cmake', '--build', '.', '--config', self.build_type]) + print("-- Finished cmake --build for pyarrow") if self.inplace: # a bit hacky @@ -225,6 +233,10 @@ def move_lib(lib_name): os.symlink(lib_filename, link_name) if self.bundle_arrow_cpp: + print(pjoin(self.build_type, 'include'), pjoin(build_lib, 'pyarrow')) + if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')): + shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include')) + shutil.move(pjoin(self.build_type, 'include'), pjoin(build_lib, 'pyarrow')) move_lib("arrow") move_lib("arrow_python") if self.with_jemalloc: