Bump versions to match scipy (#5016)

hmaarrfk · web-flow · commit c8e927e8d379 · 2020-10-15T21:56:03.000+02:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,13 +3,11 @@ requires = [
     "wheel",
     "setuptools",
     "Cython>=0.29.18",
-    # AIX is IBM's variant of UNIX; Scipy uses special handling for it.
-    # Therefore we decided to handle it in the same way.
-    # https://github.com/scipy/scipy/pull/10431#issue-295816438
-    "numpy==1.15.1; python_version=='3.6' and platform_system!='AIX'",
-    "numpy==1.15.1; python_version=='3.7' and platform_system!='AIX'",
-    "numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'",
-    "numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'",
-    "numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'",
-    "numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'",
+    # We follow scipy for much of these pinnings
+    # https://github.com/scipy/scipy/blob/master/pyproject.toml
+    "numpy==1.16.5; python_version=='3.6'",
+    "numpy==1.16.5; python_version=='3.7'",
+    "numpy==1.17.3; python_version=='3.8'",
+    # do not pin numpy on future versions of python to avoid incompatible numpy and python versions
+    "numpy; python_version>='3.9'",
 ]
diff --git a/requirements/build.txt b/requirements/build.txt
@@ -2,4 +2,4 @@ Cython>=0.29.21,!=0.29.18
 wheel
 # numpy 1.18.0 breaks builds on MacOSX
 # https://github.com/numpy/numpy/pull/15194
-numpy>=1.15.1,!=1.18.0
+numpy>=1.16.5,!=1.18.0
diff --git a/requirements/default.txt b/requirements/default.txt
@@ -1,4 +1,4 @@
-numpy>=1.15.1
+numpy>=1.16.5
 scipy>=1.0.1
 matplotlib>=2.0.0,!=3.0.0
 networkx>=2.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-numpy>=1.15.1`
	`1`	`+numpy>=1.16.5`
`2`	`2`	`scipy>=1.0.1`
`3`	`3`	`matplotlib>=2.0.0,!=3.0.0`
`4`	`4`	`networkx>=2.0`