Skip to content

Commit

Permalink
unpin numpy version (#3646)
Browse files Browse the repository at this point in the history
* unpin numpy version

* test

* always recreate tox env

* wrong way around

* nvm

* use minimum numpy version when building wheel

* also add catchall

* future is unpinned

* fix typo
  • Loading branch information
ahnitz authored Feb 26, 2021
1 parent 10158dd commit 3e4ea07
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
13 changes: 11 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
[build-system]
requires = ["setuptools",
"wheel",
"cython>=0.29",
"numpy>=1.16.0,!=1.19.0,<1.20.0"]
"cython>=0.29.21",
"numpy==1.16.0; python_version <= '3.7'",
"numpy==1.17.3; python_version == '3.8'",
"numpy==1.19.3; python_version == '3.9'",
"numpy; python_version >= '3.10'",
]

# To ensure the best compatibility, try to match the numpy reqs
# where possible to the following used by scipy and the minimum
# of our normal numpy requirements in setup.py
# https://github.com/scipy/oldest-supported-numpy/blob/master/setup.cfg
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ decorator>=3.4.2
scipy>=0.16.0; python_version >= '3.5'
scipy>=0.16.0,<1.3.0; python_version <= '3.4'
matplotlib>=2.0.0
numpy>=1.16.0,!=1.19.0,<1.20.0; python_version >= '3.5'
numpy>=1.16.0,!=1.19.0; python_version >= '3.5'
numpy>=1.16.0,<1.17.0; python_version <= '3.4'
pillow
h5py>=2.5
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
install_requires = setup_requires + ['Mako>=1.0.1',
'cython>=0.29',
'decorator>=3.4.2',
'numpy>=1.16.0,!=1.19.0,<1.20.0; python_version >= "3.5"',
'numpy>=1.16.0,!=1.19.0; python_version >= "3.5"',
'numpy>=1.16.0,<1.17.0; python_version <= "2.7"',
'scipy>=0.16.0; python_version >= "3.5"',
'scipy>=0.16.0,<1.3.0; python_version <= "3.4"',
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[tox]
recreate = true
envlist = py-unittest
indexserver =
preinstall = https://pypi.python.org/simple
Expand Down

0 comments on commit 3e4ea07

Please sign in to comment.