Merge pull request #45 from mattip/updates

update build configurations
pypy · Oct 29, 2023 · dfd08be · dfd08be
2 parents 4e67bbc + 340044b
commit dfd08be
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/.github/workflows/cython.yml b/.github/workflows/cython.yml
@@ -1,8 +1,5 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Cython
 
-# Controls when the action will run.
 on:
   workflow_dispatch:
   pull_request:
@@ -19,7 +16,6 @@ on:
   #        │ │ │ │ │
   - cron: "0 2 * * 0"
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   cython:
@@ -66,11 +62,17 @@ jobs:
 
       - name: install external dependencies
         if : ${{ matrix.os == 'ubuntu' }}
-        run: python -m pip install numpy pythran
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
+          python -m pip install pythran --no-build-isolation
 
       - name: install external dependencies
         if : ${{ matrix.os == 'macos' }}
-        run: python -m pip install numpy pythran
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
+          python -m pip install pythran --no-build-isolation
 
       - name: Enable long paths on Windows
         if: startsWith(runner.os, 'Windows')

diff --git a/.github/workflows/nanobind.yml b/.github/workflows/nanobind.yml
@@ -16,10 +16,6 @@ on:
   #        │ │ │ │ │
   - cron: "0 2 * * 0"
 
-concurrency:
-  group: test-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
   PIP_ONLY_BINARY: numpy
   FORCE_COLOR: 3
@@ -37,14 +33,6 @@ jobs:
         - 'pypy-3.10-nightly'
         - 'pypy-3.9-nightly'
 
-        # Items in here will either be added to the build matrix (if not
-        # present), or add new keys to an existing matrix element if all the
-        # existing keys match.
-        #
-        # We support an optional key: args, for cmake args
-        include:
-          - runs-on: ubuntu-latest
-            python: 'pypy-3.9-nightly'
 
     name: "nanobind ${{ matrix.python }} • ${{ matrix.runs-on }} x64 ${{ matrix.args }}"
     runs-on: ${{ matrix.runs-on }}

diff --git a/.github/workflows/pythran.yml b/.github/workflows/pythran.yml
@@ -21,6 +21,7 @@ jobs:
   pythran-linux:
     name: Test ubuntu ${{ matrix.python_version[1] }} ${{ matrix.cpp-version }}
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 160
     strategy:
       fail-fast: false
       matrix:
@@ -29,11 +30,6 @@ jobs:
         python_version:
           - [pypy-3.10-nightly, pypy10]
           - [pypy-3.9-nightly, pypy39]
-
-
-
-    timeout-minutes: 160
-
     steps:
     - uses: actions/setup-python@v4
       with:
@@ -49,6 +45,7 @@ jobs:
       run: |
         cd pythran
         python -m pip install --upgrade pip
+        python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
         pip install -r requirements.txt
         pip install ipython nbval pytest-xdist wheel
         sudo apt install libopenblas-dev ${{ matrix.cpp-version }}
@@ -92,6 +89,8 @@ jobs:
       run: |
         cd pythran
         python -m pip install --upgrade pip
+        python -m pip install cython
+        python -m pip install numpy --no-build-isolation -Csetup-args="-Dallow-noblase=true"
         pip install -r requirements.txt -Csetup-args="--vsenv" -Csetup-args="-Dblas=none" -Csetup-args="-Dlapack=none" -Csetup-args="-Dallow-noblas=true"
         pip install wheel pythran-openblas pytest pytest-timeout
         # pip install scipy  # no wheel availabe, compilation takes too long