From ed838eb038d026c6c9059544d449e537c0c6459b Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 24 Oct 2022 12:11:23 +0200 Subject: [PATCH 1/6] MAINT force numpy version for Windows and Python 3.10 --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 674aba5138cb8..77865a92a2cc0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,8 @@ requires = [ # wheels on PyPI # # see: https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg - "oldest-supported-numpy", + "oldest-supported-numpy; not (python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy')", + "numpy==1.22.3; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'", "scipy>=1.3.2", ] From 1af464d5f6cf657d5d51e577f495261efe485b9a Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 24 Oct 2022 12:13:23 +0200 Subject: [PATCH 2/6] [cd build] trigger wheels From d08949ef29b233712fa64b887f5af3737f856f72 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 24 Oct 2022 12:36:43 +0200 Subject: [PATCH 3/6] [cd build] different order since not() does not exist --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 77865a92a2cc0..671ffece74aa2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,8 +9,8 @@ requires = [ # wheels on PyPI # # see: https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg - "oldest-supported-numpy; not (python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy')", "numpy==1.22.3; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'", + "oldest-supported-numpy", "scipy>=1.3.2", ] From 60f5cb0084f43ee9978afd008887f246f09a9e9f Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 24 Oct 2022 15:45:21 +0200 Subject: [PATCH 4/6] specify the correct set of parametrs --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 671ffece74aa2..d4cf20f5bc979 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,8 +9,11 @@ requires = [ # wheels on PyPI # # see: https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg + "oldest-supported-numpy; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'", + # For CPython 3.10 under Windows, SciPy requires NumPy 1.22.3 while the + # oldest supported NumPy is defined as 1.21.6. We therefore need to force + # it for this specific configuration. "numpy==1.22.3; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'", - "oldest-supported-numpy", "scipy>=1.3.2", ] From 07651872a631501a3def8d7347bf31effbe49596 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Mon, 24 Oct 2022 15:48:52 +0200 Subject: [PATCH 5/6] [cd build] trigger wheel build From e562ece6434a1702fee2caa76e3784ad49538ee9 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 25 Oct 2022 08:11:06 +0200 Subject: [PATCH 6/6] Add link to scipy Co-authored-by: Thomas J. Fan --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d4cf20f5bc979..92ed0f0564eee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,8 @@ requires = [ "oldest-supported-numpy; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'", # For CPython 3.10 under Windows, SciPy requires NumPy 1.22.3 while the # oldest supported NumPy is defined as 1.21.6. We therefore need to force - # it for this specific configuration. + # it for this specific configuration. For details, see + # https://github.com/scipy/scipy/blob/c58b608c83d30800aceee6a4dab5c3464cb1de7d/pyproject.toml#L38-L41 "numpy==1.22.3; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'", "scipy>=1.3.2",