Skip to content

Backport PR #34667 on branch 1.0.x (BLD: pyproject.toml for Py38) #34786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 15, 2020
Merged

Backport PR #34667 on branch 1.0.x (BLD: pyproject.toml for Py38) #34786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f472100
Backport PR #34667 on branch 1.0.x (BLD: pyproject.toml for Py38)
TomAugspurger Jun 11, 2020
4799a87
update per comment
simonjayhawkins Jun 15, 2020
622cc97
Merge remote-tracking branch 'upstream/1.0.x' into backport-of-34667
simonjayhawkins Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/source/whatsnew/v1.0.5.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove those two lines, it's duplicating from above, and was only introduced because on master we dropped support for numpy < 1.15, but we didn't do that on 1.0.x

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and the previous line changed to == from >=

"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]
Expand Down