Use PIP_FLAGS in GH action

PyWavelets · Sep 11, 2023 · dd6330e · dd6330e
1 parent 9f616ca
commit dd6330e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -58,8 +58,11 @@ jobs:
             OPTIONS_NAME: "pre-releases"
           - platform_id: manylinux_x86_64
             python-version: '3.12-dev'
-            PIP_FLAGS: "--pre"
+            PIP_FLAGS: "--pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
             OPTIONS_NAME: "pre-releases"
+        exclude:
+          - python-version: '3.12-dev'
+            PIP_FLAGS: [""]
 
     steps:
       - name: Checkout PyWavelets
@@ -94,11 +97,11 @@ jobs:
                 pip install ${NUMPY_MIN}
                 if [ "${USE_SCIPY}" == "1" ]; then pip install ${SCIPY_MIN}; fi
             else
-                pip install cython
-                pip install numpy
-                if [ "${USE_SCIPY}" == "1" ]; then pip install scipy; fi
+                pip install ${PIP_FLAGS} cython
+                pip install ${PIP_FLAGS} numpy
+                if [ "${USE_SCIPY}" == "1" ]; then pip install ${PIP_FLAGS} scipy; fi
             fi
-            pip install matplotlib pytest
+            pip install ${PIP_FLAGS} matplotlib pytest
 
             set -o pipefail
             if [ "${USE_WHEEL}" == "1" ]; then
@@ -117,7 +120,6 @@ jobs:
 
       - name: Run tests
         env:
-            PIP_FLAGS: ${{ matrix.PIP_FLAGS }}
             USE_WHEEL: ${{ matrix.USE_WHEEL }}
             USE_SDIST: ${{ matrix.USE_SDIST }}
             REFGUIDE_CHECK: ${{ matrix.REFGUIDE_CHECK }}
@@ -170,8 +172,11 @@ jobs:
             PIP_FLAGS: "--pre"
             OPTIONS_NAME: "pre-releases"
           - python-version: '3.12-dev'
-            PIP_FLAGS: "--pre"
+            PIP_FLAGS: "--pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
             OPTIONS_NAME: "pre-releases"
+        exclude:
+          - python-version: '3.12-dev'
+            PIP_FLAGS: [""]
 
     steps:
       - name: Checkout PyWavelets
@@ -205,10 +210,10 @@ jobs:
                 pip install ${CYTHON_MIN} ${NUMPY_MIN}
                 if [ "${USE_SCIPY}" == "1" ]; then pip install ${SCIPY_MIN}; fi
             else
-                pip install cython numpy
-                if [ "${USE_SCIPY}" == "1" ]; then pip install scipy; fi
+                pip install ${PIP_FLAGS} cython numpy
+                if [ "${USE_SCIPY}" == "1" ]; then pip install ${PIP_FLAGS} scipy; fi
             fi
-            pip install matplotlib pytest
+            pip install ${PIP_FLAGS} matplotlib pytest
 
             set -o pipefail
             if [ "${USE_WHEEL}" == "1" ]; then

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ requires = [
     # For Python versions which aren't yet officially supported, we specify an
     # unpinned NumPy which allows source distributions to be used and allows
     # wheels to be used as soon as they become available.
-    "numpy>=1.26.0b1; python_version>='3.12rc2'",
+    "numpy>=1.26.0b1; python_version>='3.12'",
     "numpy; python_version>='3.9' and platform_python_implementation=='PyPy'",
 ]