chore: drop py38, add py312, py313 build (#26)

PolusAI · Jan 18, 2025 · c372612 · c372612
1 parent d922063
commit c372612
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04, macos-13, windows-latest]
         cibw_archs: ["auto64"]
-        cibw_build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
+        cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
 
     steps:
       - uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.2 delvewheel==1.7.1 wheel
+          python -m pip install cibuildwheel delvewheel wheel
 
       - name: Building wheels 
         run: |
@@ -76,7 +76,7 @@ jobs:
                                    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo &&
                                    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && 
                                    yum -y install maven java
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Install Dependencies
@@ -98,7 +98,7 @@ jobs:
       matrix:
         os: [macos-13-xlarge]
         cibw_archs: ["arm64"]
-        cibw_build: ["cp39-*", "cp310-*", "cp311-*"]
+        cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
 
     steps:
       - uses: actions/checkout@v3
@@ -111,7 +111,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.2 delocate wheel
+          python -m pip install cibuildwheel delocate wheel
 
       - name: Building wheels 
         run: |
@@ -120,8 +120,9 @@ jobs:
           CIBW_BUILD: ${{ matrix.cibw_build }}
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ARCHS_MACOS: arm64
-          CIBW_BEFORE_ALL_MACOS:  brew install nasm libjpeg-turbo &&
+          CIBW_BEFORE_ALL_MACOS:  brew install nasm &&
                                   brew install llvm@16 && 
+                                  brew uninstall --ignore-dependencies jpeg-turbo && 
                                   sudo xcode-select -s /Applications/Xcode_14.2.app &&
                                   bash ci-utils/install_prereq_linux.sh &&
                                   mkdir -p /tmp/argolid_bld &&
@@ -130,7 +131,7 @@ jobs:
           CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CMAKE_ARGS="-DTENSORSTORE_USE_SYSTEM_JPEG=ON"
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Install Dependencies

diff --git a/.github/workflows/wheel_build.yml b/.github/workflows/wheel_build.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04, macos-13, windows-latest]
         cibw_archs: ["auto64"]
-        cibw_build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
+        cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
 
     steps:
       - uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.2 delvewheel==1.7.1 wheel
+          python -m pip install cibuildwheel delvewheel wheel
 
       - name: Building wheels 
         run: |
@@ -74,7 +74,7 @@ jobs:
                                    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo &&
                                    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && 
                                    yum -y install maven java
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Upload Artifact
@@ -93,7 +93,7 @@ jobs:
       matrix:
         os: [macos-13-xlarge]
         cibw_archs: ["arm64"]
-        cibw_build: ["cp39-*", "cp310-*", "cp311-*"]
+        cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
 
     steps:
       - uses: actions/checkout@v3
@@ -106,7 +106,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.2 delocate wheel
+          python -m pip install cibuildwheel delocate wheel
 
       - name: Building wheels 
         run: |
@@ -115,8 +115,9 @@ jobs:
           CIBW_BUILD: ${{ matrix.cibw_build }}
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ARCHS_MACOS: arm64
-          CIBW_BEFORE_ALL_MACOS:  brew install nasm libjpeg-turbo &&
-                                  brew install llvm@16 && 
+          CIBW_BEFORE_ALL_MACOS:  brew install nasm &&
+                                  brew install llvm@16 &&
+                                  brew uninstall --ignore-dependencies jpeg-turbo && 
                                   sudo xcode-select -s /Applications/Xcode_14.2.app &&
                                   bash ci-utils/install_prereq_linux.sh &&
                                   mkdir -p /tmp/argolid_bld &&
@@ -125,7 +126,7 @@ jobs:
           CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CMAKE_ARGS="-DTENSORSTORE_USE_SYSTEM_JPEG=ON"
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Upload Artifact

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
@@ -30,4 +30,15 @@ mkdir build_man
 cd build_man
 cmake -DCMAKE_INSTALL_PREFIX=../../$LOCAL_INSTALL_DIR/  -DPYBIND11_TEST=OFF ..
 make install -j4
-cd ../../
+cd ../../
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+      curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip
+      unzip 3.1.0.zip
+      cd libjpeg-turbo-3.1.0
+      mkdir build_man
+      cd build_man
+      cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_STATIC=FALSE -DCMAKE_BUILD_TYPE=Release ..
+      sudo make install -j4
+      cd ../../
+fi