You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/06/06 18:26:40 UTC
arrow git commit: ARROW-1090: Improve build_ext usability with
--bundle-arrow-cpp
Repository: arrow
Updated Branches:
refs/heads/master 5589dda50 -> c3e865d5f
ARROW-1090: Improve build_ext usability with --bundle-arrow-cpp
This is based on a blackbox understanding of the build toolchain. It might be cleaner to update `FindArrow.cmake`, but I'm not sure what the consequences of that would be. This shouldn't be able to do much harm, since this codepath would previously crash.
Author: Jacob Scott <jh...@infer.com>
Closes #734 from snakescott/ARROW-1090 and squashes the following commits:
642f9404 [Jacob Scott] Do not attempt to fix cmake on windows
39c8df62 [Jacob Scott] [ARROW-1090] Add doc with instructions for building a wheel
9c1d9c2e [Jacob Scott] [ARROW-1090] Improve build_ext usability with --bundle-arrow-cpp
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/c3e865d5
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/c3e865d5
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/c3e865d5
Branch: refs/heads/master
Commit: c3e865d5f67fe9059e80e6b59b2b20bd42e7bcc4
Parents: 5589dda
Author: Jacob Scott <jh...@infer.com>
Authored: Tue Jun 6 14:26:36 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Tue Jun 6 14:26:36 2017 -0400
----------------------------------------------------------------------
python/doc/source/development.rst | 8 ++++++++
python/setup.py | 5 +++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/c3e865d5/python/doc/source/development.rst
----------------------------------------------------------------------
diff --git a/python/doc/source/development.rst b/python/doc/source/development.rst
index 410f838..cd24406 100644
--- a/python/doc/source/development.rst
+++ b/python/doc/source/development.rst
@@ -171,6 +171,14 @@ You should be able to run the unit tests with:
====================== 181 passed, 17 skipped in 0.98 seconds ===========
+You can build a wheel by running:
+
+.. code-block:: shell
+ python setup.py build_ext --build-type=$ARROW_BUILD_TYPE \
+ --with-parquet --with-jemalloc --bundle-arrow-cpp bdist_wheel
+
+Again, if you did not build parquet-cpp, you should omit ``--with-parquet``.
+
Windows
=======
http://git-wip-us.apache.org/repos/asf/arrow/blob/c3e865d5/python/setup.py
----------------------------------------------------------------------
diff --git a/python/setup.py b/python/setup.py
index 817c59f..e10b4b8 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -148,6 +148,11 @@ class build_ext(_build_ext):
if self.bundle_arrow_cpp:
cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
+ # ARROW-1090: work around CMake rough edges
+ if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
+ os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
+ del os.environ['ARROW_HOME']
+
cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
.format(self.build_type.lower()))