Merge pull request #41 from neuro-ml/dev

Fix building wheels
neuro-ml · Oct 18, 2023 · 00d388b · 00d388b
2 parents 90ad3a8 + 600379b
commit 00d388b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.9.0
+        run: python -m pip install cibuildwheel==2.10.0
       - name: Install gcc for mac
         if: matrix.os == 'macOS-11'
         run: |
@@ -54,11 +54,14 @@ jobs:
           ls /usr/local/bin/gcc*
           gcc --version
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
+        run: |
+          python -m pip install --upgrade pip
+          python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ENVIRONMENT_MACOS: >
             PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include"
           CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-*
+          CIBW_BEFORE_BUILD: 'python -m pip install "numpy<2.0.0" --config-settings=setup-args="-Dallow-noblas=true"'
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl

diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
@@ -9,7 +9,7 @@ jobs:
   build_wheels:
     strategy:
       matrix:
-        os: [ windows-2019, macOS-11 ]
+        os: [ubuntu-20.04, windows-2019, macOS-11 ]
 
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.9.0
+        run: python -m pip install cibuildwheel==2.10.0
       - name: Install gcc for mac
         if: matrix.os == 'macOS-11'
         run: |
@@ -28,8 +28,12 @@ jobs:
           ls /usr/local/bin/gcc*
           gcc --version
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
+        run: |
+          python -m pip install --upgrade pip
+          python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ENVIRONMENT_MACOS: >
             PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include"
-          CIBW_BUILD: cp310-*
+          CIBW_BUILD: cp39-*
+          CIBW_SKIP: "*musllinux* *manylinux_x86_64"
+          CIBW_BEFORE_BUILD: 'python -m pip install "numpy<2.0.0" --config-settings=setup-args="-Dallow-noblas=true"'
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ['setuptools', 'numpy', 'Cython<3.0.0']
+requires = ['setuptools', 'numpy<2.0.0', 'Cython<3.0.0']
 build-backend = 'setuptools.build_meta'
 
 [project]