8000 MNT Update `asv.conf.json` to get rid of last references to Python 2.7 by DimitriPapadopoulos · Pull Request #31064 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

MNT Update asv.conf.json to get rid of last references to Python 2.7 #31064

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
Merged
merged 4 commits into from
Mar 25, 2025
Merged

MNT Update asv.conf.json to get rid of last references to Python 2.7 #31064

merged 4 commits into from
Mar 25, 2025

Conversation

DimitriPapadopoulos
Copy link
Contributor

What does this implement/fix? Explain your changes.

  • six is not used anymore
  • Use newer version of Python in examples.

Also fix typo:
platform → sys_platform

Any other comments?

Not sure about this one, I have yet to understand the comment:

scikit-learn/sklearn/utils/deprecation.py

Lines 98 to 100 in 85fb4da

# Add a reference to the wrapped function so that we can introspect
# on function arguments in Python 2 (already works in Python 3)
wrapped.__wrapped__ = fun

@github-actions GitHub Actions
Copy link
github-actions bot commented Mar 24, 2025 •
edited
Loading

✔️ Linting Passed

All linting checks passed. Your pull request is in excellent shape! ☀️

Generated for commit: b7731f6. Link to the linter CI: here

@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as ready for review March 24, 2025 18:10
@jeremiedbb
Copy link
Member

Note that these references are in comments. They're here because this file was entirely copied from the asv config example file when it was configured for sklearn. That being said, I'm okay to remove these references since no one would use them in any case.

@DimitriPapadopoulos
Copy link
Contributor Author
DimitriPapadopoulos commented Mar 25, 2025 •
edited
Loading

My wrong then.

The upstream file https://github.com/airspeed-velocity/asv/blob/main/asv.conf.json has evolved as well, and has removed references to Python 2. Perhaps I could sync with the upstream file.

@DimitriPapadopoulos
MNT Get rid of last references to Python 2.7
ad9d24f 
* six is not used anymore
* Use newer version of Python in examples.

Also fix typo:
platform → sys_platform
@DimitriPapadopoulos DimitriPapadopoulos changed the title MNT Get rid of last references to Python 2.7 MNT Update asv.conf.json to get rid of last references to Python 2.7 Mar 25, 2025
@DimitriPapadopoulos DimitriPapadopoulos changed the title MNT Update asv.conf.json to get rid of last references to Python 2.7 MNT Update asv.conf.json to get rid of last references to Python 2.7 Mar 25, 2025
@DimitriPapadopoulos
Copy link
Contributor Author

Sync'ed with latest asv.conf.json and re-applied local changes.

@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as draft March 25, 2025 16:29
@DimitriPapadopoulos DimitriPapadopoulos force-pushed the python2 branch 2 times, most recently from 001d694 to 04c970c Compare March 25, 2025 16:37
jeremiedbb
jeremiedbb reviewed Mar 25, 2025
View reviewed changes
Copy link
Member
@jeremiedbb jeremiedbb left a comment

Choose a reason for hiding this comment

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

Okay to sync with a more recent version of the config file

@DimitriPapadopoulos
MNT asv: Apply local changes to asv.conf.json
b2721ee 
Apply local changes to sample asv.conf.json from upstream.
@DimitriPapadopoulos
MNT asv: platform → sys_platform
b7731f6 
Fix typo from usptream:
airspeed-velocity/asv#1477
@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as ready for review March 25, 2025 17:30
jeremiedbb
jeremiedbb approved these changes Mar 25, 2025
View reviewed changes
Copy link
Member
@jeremiedbb jeremiedbb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks

@jeremiedbb jeremiedbb merged commit 734245a into scikit-learn:main Mar 25, 2025
33 checks passed
@DimitriPapadopoulos DimitriPapadopoulos deleted the python2 branch March 25, 2025 20:23
lucyleeow pushed a commit to lucyleeow/scikit-learn that referenced this pull request Apr 2, 2025
@DimitriPapadopoulos @lucyleeow
MNT Update asv.conf.json to get rid of last references to Python 2.7 (
5afcfb6 
scikit-learn#31064)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeremiedbb jeremiedbb jeremiedbb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DimitriPapadopoulos @jeremiedbb
0