ARROW-1535: [Python] Enable sdist tarballs to be installed

The tarballs produced by `setup.py sdist` have always been broken. This creates a tarball that can be installed assuming that the Arrow/Parquet C++ libraries are installed already on the target system. I wanted to see if I could bundle the `cpp/cmake_modules` files without using a symlink but I couldn't figure it out; it might require subclassing the sdist cmdclass to make this work. I'm not sure having the symlink is so bad Author: Wes McKinney <wes.mckinney@twosigma.com> Closes #1188 from wesm/ARROW-1535 and squashes the following commits: dcc2e47 [Wes McKinney] Fix RAT excludes given changes to cmake files 310af1b [Wes McKinney] Move all cmake files to cpp/cmake_modules, fix up sdist tarball so it can be built/installed
apache · Oct 9, 2017 · a0555c0 · a0555c0
1 parent 81a0e67
commit a0555c0
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 13 deletions.
diff --git a/python/cmake_modules/FindArrow.cmake → cpp/cmake_modules/FindArrow.cmake b/python/cmake_modules/FindArrow.cmake → cpp/cmake_modules/FindArrow.cmake
diff --git a/python/cmake_modules/FindCython.cmake → cpp/cmake_modules/FindCython.cmake b/python/cmake_modules/FindCython.cmake → cpp/cmake_modules/FindCython.cmake
diff --git a/python/cmake_modules/FindParquet.cmake → cpp/cmake_modules/FindParquet.cmake b/python/cmake_modules/FindParquet.cmake → cpp/cmake_modules/FindParquet.cmake
diff --git a/python/cmake_modules/FindPlasma.cmake → cpp/cmake_modules/FindPlasma.cmake b/python/cmake_modules/FindPlasma.cmake → cpp/cmake_modules/FindPlasma.cmake
diff --git a/python/cmake_modules/UseCython.cmake → cpp/cmake_modules/UseCython.cmake b/python/cmake_modules/UseCython.cmake → cpp/cmake_modules/UseCython.cmake
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
@@ -34,11 +34,7 @@ cpp/src/plasma/thirdparty/xxhash.h
 dev/release/rat_exclude_files.txt
 js/.npmignore
 js/closure-compiler-scripts/*
-python/cmake_modules/BuildUtils.cmake
-python/cmake_modules/FindPythonLibsNew.cmake
-python/cmake_modules/FindNumPy.cmake
-python/cmake_modules/SetupCxxFlags.cmake
-python/cmake_modules/CompilerInfo.cmake
+python/cmake_modules
 python/doc/requirements.txt
 python/MANIFEST.in
 python/pyarrow/includes/__init__.pxd

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -21,7 +21,17 @@
 cmake_minimum_required(VERSION 2.7)
 project(pyarrow)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
+# Running from a Python sdist tarball
+set(LOCAL_CMAKE_MODULES "${CMAKE_SOURCE_DIR}/cmake_modules")
+if (EXISTS "${LOCAL_CMAKE_MODULES}")
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULES})
+endif()
+
+# Running from a git source tree
+set(CPP_CMAKE_MODULES "${CMAKE_SOURCE_DIR}/../cpp/cmake_modules")
+if (EXISTS "${CPP_CMAKE_MODULES}")
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CPP_CMAKE_MODULES})
+endif()
 
 include(CMakeParseArguments)
 

diff --git a/python/MANIFEST.in b/python/MANIFEST.in
@@ -2,9 +2,8 @@ include README.md
 include LICENSE.txt
 
 global-include CMakeLists.txt
+graft pyarrow
 graft cmake_modules
-recursive-include src/pyarrow *.cc *.h
-recursive-include pyarrow *.pxd
 
 global-exclude *.so
 global-exclude *.pyc

diff --git a/python/cmake_modules b/python/cmake_modules
@@ -0,0 +1 @@
+../cpp/cmake_modules
diff --git a/python/cmake_modules/BuildUtils.cmake b/python/cmake_modules/BuildUtils.cmake
diff --git a/python/cmake_modules/CompilerInfo.cmake b/python/cmake_modules/CompilerInfo.cmake
diff --git a/python/cmake_modules/FindNumPy.cmake b/python/cmake_modules/FindNumPy.cmake
diff --git a/python/cmake_modules/FindPythonLibsNew.cmake b/python/cmake_modules/FindPythonLibsNew.cmake
diff --git a/python/cmake_modules/SetupCxxFlags.cmake b/python/cmake_modules/SetupCxxFlags.cmake