Merge pull request #90 from je-cook/je-cook/scipy-version-bump

Bump scipy version to <1.11.0

.github/workflows/test_and_deploy.yml

@@ -11,14 +11,15 @@ on:
       - '*'
 
 env:
-  MAIN_PYVER: 3.8
+  MAIN_PYVER: "3.10"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        scipy-version: [">=0.16,<1.4", ">=1.4,<=1.7.3"]
+        scipy-version: [">=1.4,<1.11.0"]
+        numpy-version: ["<1.22.0", ">=1.22.0"]
     steps:
       - name: Install glibc-tools
         shell: bash -l {0}
@@ -39,7 +40,7 @@ jobs:
       - name: Install dependencies
         shell: bash -l {0}
         run: |
-          conda install -c numba conda-build python=${{ env.MAIN_PYVER }} numba>=0.45 'scipy${{ matrix.scipy-version }}' flake8 pytest pip
+          conda install -c numba conda-build python=${{ env.MAIN_PYVER }} numba>=0.45 'scipy${{ matrix.scipy-version }}' 'numpy${{ matrix.numpy-version }}' flake8 pytest pip
           pip install --no-deps -e .
       - name: Lint with flake8
         shell: bash -l {0}
@@ -69,9 +70,27 @@ jobs:
     needs: build
     strategy:
       matrix:
-        scipy-version: [">=0.16,<1.4", ">=1.4,<=1.7.3"]
-        pyver: [3.6, 3.7, 3.8]
+        scipy-version: [">=1.4,<1.11.0"]
+        pyver: [3.8, 3.9, "3.10", 3.11]
         runs-on: [macos-latest, ubuntu-latest, windows-latest]
+        numpy-version: ["<1.22.0", ">=1.22.0"]
+        exclude:
+          - pyver: 3.11
+            numpy-version: "<1.22.0"
+        include:
+          - pyver: 3.8
+            scipy-version: ">=0.16,<1.4"
+            numpy-version: "<1.22.0"
+            runs-on: macos-latest
+          - pyver: 3.8
+            scipy-version: ">=0.16,<1.4"
+            numpy-version: "<1.22.0"
+            runs-on: ubuntu-latest
+          - pyver: 3.8
+            scipy-version: ">=0.16,<1.4"
+            numpy-version: "<1.22.0"
+            runs-on: windows-latest
+
     runs-on: ${{ matrix.runs-on }}
     steps:
       - name: Download build artifact
@@ -88,7 +107,7 @@ jobs:
       - name: Install dependencies and build artifact
         shell: bash -l {0}
         run: |
-          conda install -c numba python=${{ matrix.pyver }} numba>=0.45 'scipy${{ matrix.scipy-version }}' flake8 pytest
+          conda install -c numba python=${{ matrix.pyver }} numba>=0.45 'scipy${{ matrix.scipy-version }}' 'numpy${{ matrix.numpy-version }}' flake8 pytest
           # Install built_package
           BUILT_PKG=$(ls ./artifact_storage | head -1)
           conda install ./artifact_storage/$BUILT_PKG

azure-pipelines.yml

@@ -3,38 +3,32 @@ jobs:
 - template: buildscripts/azure/azure-linux-macos.yml
   parameters:
     name: Linux
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-22.04
     matrix:
-      py37_np116_sp11:
-        PYTHON: '3.7'
-        NUMPY: '1.16'
-        SCIPY: '1.1'
+      py310_np123_sp1_10:
+        PYTHON: '3.10'
+        NUMPY: '1.23'
+        SCIPY: '1.10'
         CONDA_ENV: 'testenv'
-      py37_np115_sp11_32bit:
-        PYTHON: '3.7'
-        NUMPY: '1.15'
-        SCIPY: '1.1'
-        CONDA_ENV: 'testenv'
-        BITS32: yes
 
 - template: buildscripts/azure/azure-linux-macos.yml
   parameters:
     name: macOS
-    vmImage: macOS-10.15
+    vmImage: macOS-latest
     matrix:
-      py37_np116_sp11:
-        PYTHON: '3.7'
-        NUMPY: '1.16'
-        SCIPY: '1.1'
+      py310_np123_sp1_10:
+        PYTHON: '3.10'
+        NUMPY: '1.23'
+        SCIPY: '1.10'
         CONDA_ENV: 'testenv'
 
 - template: buildscripts/azure/azure-windows.yml
   parameters:
     name: Windows
     vmImage: windows-2019
     matrix:
-      py37_np116_sp11:
-        PYTHON: '3.7'
-        NUMPY: '1.16'
-        SCIPY: '1.1'
+      py310_np123_sp1_10:
+        PYTHON: '3.10'
+        NUMPY: '1.23'
+        SCIPY: '1.10'
         CONDA_ENV: 'testenv'

buildscripts/azure/azure-linux-macos.yml

@@ -15,6 +15,7 @@ jobs:
   steps:
     - script: |
         if [ "$(uname)" == "Linux" ] && [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]]; then sudo apt-get install -y libc6-dev-i386; fi
+        if [ "$(uname)" == "Linux" ] && [[ "$CONDA_SUBDIR" != "linux-32" || "$BITS32" != "yes" ]]; then sudo apt-get install -y glibc-tools; fi
         echo "Installing Miniconda"
         buildscripts/incremental/install_miniconda.sh
         export PATH=$HOME/miniconda3/bin:$PATH

buildscripts/conda_recipes/numba-scipy/meta.yaml

@@ -18,16 +18,16 @@ requirements:
   host:
     - python
     - numba
-    - scipy<=1.7.3
+    - scipy<1.11.0
     - setuptools
   run:
     - python
     - numba
-    - scipy<=1.7.3
+    - scipy<1.11.0
 
 test:
   requires:
-    - scipy<=1.7.3
+    - scipy<1.11.0
     - pytest
     - setuptools
     - faulthandler             # [py27 and (not (armv6l or armv7l))]

setup.py

@@ -2,25 +2,24 @@
 import versioneer
 
 
-_install_requires = ['scipy>=0.16,<=1.7.3', 'numba>=0.45']
+_install_requires = ["scipy>=0.16,<=1.11.0", "numba>=0.45"]
 
 
 metadata = dict(
-    name='numba-scipy',
+    name="numba-scipy",
     description="numba-scipy extends Numba to make it aware of SciPy",
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
-
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Compilers",
     ],
     package_data={},
@@ -42,8 +41,8 @@
 )
 
 
-with open('README.rst') as f:
-    metadata['long_description'] = f.read()
+with open("README.rst") as f:
+    metadata["long_description"] = f.read()
 
 
 setup(**metadata)