Skip to content
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

Jump to bottom

MAINT: "backport" 3.10 support #14921

Merged
merged 2 commits into from Oct 29, 2021
Merged

MAINT: "backport" 3.10 support #14921

merged 2 commits into from Oct 29, 2021

Conversation

tylerjereddy
Copy link
Contributor

@tylerjereddy
MAINT: "backport" 3.10 support
e9114b0 
* changes related to enabling Python `3.10` support
on the `maintenance/1.7.x` branch based on failures
in the wheels repo here:
MacPython/scipy-wheels#135
@tylerjereddy tylerjereddy added the maintenance Items related to regular maintenance tasks label Oct 27, 2021
@tylerjereddy tylerjereddy added this to the 1.7.2 milestone Oct 27, 2021
@tylerjereddy
Copy link
Contributor Author

mac os failure needs backport of gh-14831, which is already in my list (this PR is separate to make sure that metadata/config adjustments for 3.10 are done correctly). Coverage failure in the CI should be addressed by gh-14803, which is also already labelled for backport.

rgommers
rgommers reviewed Oct 27, 2021
View reviewed changes
Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

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

Thanks Tyler. What's here looks good, there's a few other things to update:

  • add Programming Language :: Python :: 3.10 to the classifiers in setup.py?
  • update INSTALL.rst.txt and doc/source/toolchain.rst

@tylerjereddy
MAINT: PR 14921 revisions
3cb989c 
* a few more `3.10`-related metadata changes
based on reviewer feedback
@tylerjereddy
Copy link
Contributor Author

Ok, I tried to make some of those changes--I don't think I could figure out one of them though: git diff master -- INSTALL.rst.txt is blank.

@rgommers
Copy link
Member

Ok, I tried to make some of those changes--I don't think I could figure out one of them though: git diff master -- INSTALL.rst.txt is blank.

I had a look - the upper bound is missing in INSTALL.rst.txt in master. I'm not too bothered, that file is always going out of date, because it's duplicate info with more important places. We should get rid of it completely at some point (but not today).

rgommers
rgommers approved these changes Oct 29, 2021
View reviewed changes
Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

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

Guess we haven't touched this branch in a while, because some of these CI failures we fixed in master quite a while ago.

We don't have a 3.10 CI job in this branch, but the changes are definitely correct, and given that they unblock MacPython/scipy-wheels#135 I will merge them.

I'll have a look at the CI failures separately now.

@rgommers rgommers merged commit 9639c9f into scipy:maintenance/1.7.x Oct 29, 2021
@tylerjereddy
Copy link
Contributor Author

I think I have backport labels on the fixes for the CI issues

@tylerjereddy tylerjereddy deleted the treddy_backport_310_support branch October 29, 2021 20:05
@rgommers
Copy link
Member

Oh okay, do you want to take care of it or does it help if I open a PR?

@rgommers
Copy link
Member

I have at least one extra, bumping the Pythran version pin. Already committed, I can submit a PR soon before daylight runs out.

@tylerjereddy
Copy link
Contributor Author

sounds good, definitely helps to label at least I'm a little behind on going through notifications to sweep for backports

@rgommers
Copy link
Member

Cool, I'll do that now.

@jarrodmillman jarrodmillman mentioned this pull request Dec 17, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgommers rgommers rgommers approved these changes

@larsoner larsoner Awaiting requested review from larsoner larsoner is a code owner

Assignees
No one assigned
Labels
maintenance Items related to regular maintenance tasks
Projects
None yet
Milestone
1.7.2
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tylerjereddy @rgommers