add py312 and py314 wheel

PolusAI · Jan 25, 2025 · ef20e1d · ef20e1d
1 parent e06e7a4
commit ef20e1d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 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", "cp314"]
 
     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: |
@@ -98,7 +98,7 @@ jobs:
       matrix:
         os: [macos-13-xlarge]
         cibw_archs: ["arm64"]
-        cibw_build: ["cp39", "cp310", "cp311"]
+        cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp314"]
 
     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/bfiocpp_bld &&

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", "cp314"]
 
     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: |
@@ -94,7 +94,7 @@ jobs:
       matrix:
         os: [macos-13-xlarge]
         cibw_archs: ["arm64"]
-        cibw_build: ["cp39", "cp310", "cp311"]
+        cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp314"]
 
     steps:
       - uses: actions/checkout@v3
@@ -107,7 +107,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: |
@@ -116,8 +116,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/bfiocpp_bld &&

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
@@ -20,4 +20,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