Skip to content

Commit

Permalink
Merge pull request #67 from esc/update_scipy
Browse files Browse the repository at this point in the history
update max SciPy to 1.7.0
  • Loading branch information
esc authored Oct 4, 2021
2 parents 9764341 + e671fbb commit af927b7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
scipy-version: [">=0.16,<1.4", ">=1.4,<=1.6.2"]
scipy-version: [">=0.16,<1.4", ">=1.4,<=1.7.0"]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
needs: build
strategy:
matrix:
scipy-version: [">=0.16,<1.4", ">=1.4,<=1.6.2"]
scipy-version: [">=0.16,<1.4", ">=1.4,<=1.7.0"]
pyver: [3.6, 3.7, 3.8]
runs-on: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.runs-on }}
Expand Down
6 changes: 3 additions & 3 deletions buildscripts/conda_recipes/numba-scipy/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ requirements:
host:
- python
- numba
- scipy<=1.6.2
- scipy<=1.7.0
- setuptools
run:
- python
- numba
- scipy<=1.6.2
- scipy<=1.7.0

test:
requires:
- scipy<=1.6.2
- scipy<=1.7.0
- pytest
- setuptools
- faulthandler # [py27 and (not (armv6l or armv7l))]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import versioneer


_install_requires = ['scipy>=0.16,<=1.6.2', 'numba>=0.45']
_install_requires = ['scipy>=0.16,<=1.7.0', 'numba>=0.45']


metadata = dict(
Expand Down

0 comments on commit af927b7

Please sign in to comment.