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.

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

Conversation

simonjayhawkins
Copy link
Member

xref #34667

@jorisvandenbossche another set of eyes needed as this was not a clean cherry-pick

@simonjayhawkins simonjayhawkins added this to the 1.0.5 milestone Jun 15, 2020
pyproject.toml Outdated
@@ -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 >=

@jorisvandenbossche jorisvandenbossche merged commit cdd245c into pandas-dev:1.0.x Jun 15, 2020
@simonjayhawkins simonjayhawkins deleted the backport-of-34667 branch June 15, 2020 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants