Merge pull request #176 from JesseMckinzie/windows_pypi_build_v2

Windows PyPI wheels with Arrow enabled
PolusAI · Nov 29, 2023 · 78046af · 78046af
2 parents cb51721 + aa86ae5
commit 78046af
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -61,9 +61,7 @@ jobs:
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_TEST_REQUIRES: numpy pandas pytest pyarrow
-          CIBW_TEST_COMMAND_MACOS: pytest {project}/tests/python
-          CIBW_TEST_COMMAND_LINUX: pytest {project}/tests/python
-          CIBW_TEST_COMMAND_WINDOWS: pytest {project}/tests/python -m "not arrow"
+          CIBW_TEST_COMMAND: pytest {project}/tests/python
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -62,9 +62,7 @@ jobs:
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_TEST_REQUIRES: numpy pandas pytest pyarrow
-          CIBW_TEST_COMMAND_MACOS: pytest {project}/tests/python
-          CIBW_TEST_COMMAND_LINUX: pytest {project}/tests/python
-          CIBW_TEST_COMMAND_WINDOWS: pytest {project}/tests/python -m "not arrow"
+          CIBW_TEST_COMMAND: pytest {project}/tests/python
 
       - name: Install Dependencies
         run: python -m pip install --upgrade twine requests

diff --git a/ci-utils/install_prereq_win.bat b/ci-utils/install_prereq_win.bat
@@ -2,6 +2,7 @@
 setlocal
 set BUILD_Z5_DEP=1
 set BUILD_DCMTK_DEP=1
+set BUILD_ARROW=1
 SET ROOTDIR="%cd%"
 
 setlocal enabledelayedexpansion
@@ -50,7 +51,8 @@ if "%BUILD_Z5_DEP%" == "1" (
     tar  -xf boost_1_79_0.zip
     pushd boost_1_79_0 
     call bootstrap.bat 
-    .\b2 headers
+    .\b2 headers --prefix=../local_install
+    .\b2 install --prefix=../local_install
     xcopy /E /I /y boost ..\local_install\include\boost
     popd
 
@@ -116,6 +118,24 @@ if "%BUILD_Z5_DEP%" == "1" (
 )
 
 
+set _ROOTDIR=%ROOTDIR:\=/%
+if "%BUILD_ARROW%" == "1" (
+
+    curl -L https://github.com/apache/arrow/archive/refs/tags/apache-arrow-13.0.0.zip -o  arrow-apache-arrow-13.0.0.zip
+    unzip arrow-apache-arrow-13.0.0.zip
+    pushd arrow-apache-arrow-13.0.0
+    pushd cpp
+    mkdir build
+    pushd build
+    cmake .. -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=../../../local_install/ -DCMAKE_PREFIX_PATH=../../../local_install/ -DARROW_PARQUET=ON -DARROW_WITH_SNAPPY=ON -DBOOST_ROOT=%_ROOTDIR%/boost_1_79_0
+    cmake --build . --config Release --target install --parallel 4
+    popd 
+    popd
+    popd
+)
+
+
+
 if "%BUILD_DCMTK_DEP%" == "1" (
     curl -L https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.zip -o v1.6.39.zip
     tar -xvf v1.6.39.zip