From f472100a736654e7edbaf3a529f995c428bcc5aa Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 11 Jun 2020 10:29:01 -0500 Subject: [PATCH 1/2] Backport PR #34667 on branch 1.0.x (BLD: pyproject.toml for Py38) --- doc/source/whatsnew/v1.0.5.rst | 3 ++- pyproject.toml | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/source/whatsnew/v1.0.5.rst b/doc/source/whatsnew/v1.0.5.rst index 1edc7e1cad72f..5dbc911407784 100644 --- a/doc/source/whatsnew/v1.0.5.rst +++ b/doc/source/whatsnew/v1.0.5.rst @@ -22,7 +22,8 @@ Fixed regressions Bug fixes ~~~~~~~~~ -- + +- Fixed building from source with Python 3.8 fetching the wrong version of NumPy (:issue:`34666`) - Contributors diff --git a/pyproject.toml b/pyproject.toml index 28d7c3d55c919..add4ff801f60c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,12 @@ requires = [ "Cython>=0.29.13", # Note: sync with setup.py "numpy==1.13.3; python_version=='3.6' and platform_system!='AIX'", "numpy==1.14.5; python_version>='3.7' and platform_system!='AIX'", + "numpy==1.15.4; python_version=='3.6' and platform_system!='AIX'", + "numpy==1.15.4; 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.16.0; python_version=='3.7' and platform_system=='AIX'", + "numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'", ] [tool.black] From 4799a87057f276fea4d10b5ed5451e1177f06e2f Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 15 Jun 2020 10:08:57 +0100 Subject: [PATCH 2/2] update per comment --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index add4ff801f60c..05490d5060a28 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,7 @@ requires = [ "wheel", "Cython>=0.29.13", # Note: sync with setup.py "numpy==1.13.3; python_version=='3.6' and platform_system!='AIX'", - "numpy==1.14.5; python_version>='3.7' and platform_system!='AIX'", - "numpy==1.15.4; python_version=='3.6' and platform_system!='AIX'", - "numpy==1.15.4; python_version=='3.7' and platform_system!='AIX'", + "numpy==1.14.5; 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'",