From 68cbdee5d65bb14ab1ecac33979b34c7ff91140e Mon Sep 17 00:00:00 2001 From: Collin Capano Date: Mon, 22 Jun 2020 10:13:54 +0000 Subject: [PATCH 1/2] try fixing numpy to 1.18.5 for py37 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2a9a2599a19..5d828839671 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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; python_version >= '3.5' +numpy==1.18.5; python_version >= '3.5' numpy>=1.16.0,<1.17.0; python_version <= '3.4' pillow h5py<2.10.0 From 49e46040b50f4dbb592f78344c99a930a7e01d1b Mon Sep 17 00:00:00 2001 From: Collin Capano Date: Mon, 22 Jun 2020 13:47:49 +0000 Subject: [PATCH 2/2] add more numpy settings; make it <1.19 rather than pinning to 18.5 --- pyproject.toml | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 10939bfc017..53433932a71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,4 +2,4 @@ requires = ["setuptools", "wheel", "cython>=0.29", - "numpy>=1.16.0"] + "numpy>=1.16.0,<1.19"] diff --git a/requirements.txt b/requirements.txt index 5d828839671..33bd8872e1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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.18.5; python_version >= '3.5' +numpy>=1.16.0,<1.19; python_version >= '3.5' numpy>=1.16.0,<1.17.0; python_version <= '3.4' pillow h5py<2.10.0 diff --git a/setup.py b/setup.py index d320bfff506..608bfc93367 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ install_requires = setup_requires + ['Mako>=1.0.1', 'cython>=0.29', 'decorator>=3.4.2', - 'numpy>=1.16.0; python_version >= "3.5"', + 'numpy>=1.16.0,<1.19; 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"',