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-813: [Python] setup.py sdist must also bundle dependent cmake m…
Date Thu, 11 May 2017 20:01:19 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 84413b0ec -> 1c6f3ef82


ARROW-813: [Python] setup.py sdist must also bundle dependent cmake m…

…odules

Author: Uwe L. Korn <uwelk@xhochy.com>

Closes #660 from xhochy/ARROW-813 and squashes the following commits:

47459ba [Uwe L. Korn] Call git later
5b3b4a4 [Uwe L. Korn] Symlink fixes
70ca0d8 [Uwe L. Korn] ARROW-813: [Python] setup.py sdist must also bundle dependent cmake
modules


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

Branch: refs/heads/master
Commit: 1c6f3ef82a1c76919d707a5ef28d148b9d88c3bc
Parents: 84413b0
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Thu May 11 16:01:13 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Thu May 11 16:01:13 2017 -0400

----------------------------------------------------------------------
 appveyor.yml                                 | 4 +++-
 dev/release/run-rat.sh                       | 4 ++++
 python/CMakeLists.txt                        | 5 -----
 python/cmake_modules/BuildUtils.cmake        | 1 +
 python/cmake_modules/CompilerInfo.cmake      | 1 +
 python/cmake_modules/FindNumPy.cmake         | 1 +
 python/cmake_modules/FindPythonLibsNew.cmake | 1 +
 python/cmake_modules/SetupCxxFlags.cmake     | 1 +
 8 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index f2954a9..802d43b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,4 +32,6 @@ init:
   - set PATH=%MINICONDA%;%MINICONDA%/Scripts;%MINICONDA%/Library/bin;%PATH%
 
 build_script:
- - call ci\msvc-build.bat
+  - git config core.symlinks true
+  - git reset --hard
+  - call ci\msvc-build.bat

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/dev/release/run-rat.sh
----------------------------------------------------------------------
diff --git a/dev/release/run-rat.sh b/dev/release/run-rat.sh
index 3ff9ef0..f225c66 100755
--- a/dev/release/run-rat.sh
+++ b/dev/release/run-rat.sh
@@ -34,7 +34,11 @@ $RAT $1 \
   -e status.h \
   -e asan_symbolize.py \
   -e cpplint.py \
+  -e BuildUtils.cmake \
   -e FindPythonLibsNew.cmake \
+  -e FindNumPy.cmake \
+  -e SetupCxxFlags.cmake \
+  -e CompilerInfo.cmake \
   -e pax_global_header \
   -e MANIFEST.in \
   -e __init__.pxd \

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 0d34bcd..a9db4d8 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -23,9 +23,6 @@ project(pyarrow)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
 
-# Use common cmake modules from Arrow C++ if available
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cpp/cmake_modules")
-
 include(CMakeParseArguments)
 
 # Compatibility with CMake 3.1
@@ -34,8 +31,6 @@ if(POLICY CMP0054)
   cmake_policy(SET CMP0054 NEW)
 endif()
 
-set(BUILD_SUPPORT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/build-support")
-
 # Allow "make install" to not depend on all targets.
 #
 # Must be declared in the top-level CMakeLists.txt.

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/python/cmake_modules/BuildUtils.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/BuildUtils.cmake b/python/cmake_modules/BuildUtils.cmake
new file mode 120000
index 0000000..e3c98c8
--- /dev/null
+++ b/python/cmake_modules/BuildUtils.cmake
@@ -0,0 +1 @@
+../../cpp/cmake_modules/BuildUtils.cmake
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/python/cmake_modules/CompilerInfo.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/CompilerInfo.cmake b/python/cmake_modules/CompilerInfo.cmake
new file mode 120000
index 0000000..559ac32
--- /dev/null
+++ b/python/cmake_modules/CompilerInfo.cmake
@@ -0,0 +1 @@
+../../cpp/cmake_modules/CompilerInfo.cmake
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/python/cmake_modules/FindNumPy.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/FindNumPy.cmake b/python/cmake_modules/FindNumPy.cmake
new file mode 120000
index 0000000..767b320
--- /dev/null
+++ b/python/cmake_modules/FindNumPy.cmake
@@ -0,0 +1 @@
+../../cpp/cmake_modules/FindNumPy.cmake
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/python/cmake_modules/FindPythonLibsNew.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/FindPythonLibsNew.cmake b/python/cmake_modules/FindPythonLibsNew.cmake
new file mode 120000
index 0000000..7087123
--- /dev/null
+++ b/python/cmake_modules/FindPythonLibsNew.cmake
@@ -0,0 +1 @@
+../../cpp/cmake_modules/FindPythonLibsNew.cmake
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/arrow/blob/1c6f3ef8/python/cmake_modules/SetupCxxFlags.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/SetupCxxFlags.cmake b/python/cmake_modules/SetupCxxFlags.cmake
new file mode 120000
index 0000000..3121a89
--- /dev/null
+++ b/python/cmake_modules/SetupCxxFlags.cmake
@@ -0,0 +1 @@
+../../cpp/cmake_modules/SetupCxxFlags.cmake
\ No newline at end of file


Mime
View raw message