-
-
Notifications
You must be signed in to change notification settings - Fork 476
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
Add Python 3.11 migration #3573
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| migrator_ts: 1666686085 | ||
| __migrator: | ||
| migration_number: 1 | ||
| operation: key_add | ||
| primary_key: python | ||
| ordering: | ||
| python: | ||
| - 3.6.* *_cpython | ||
| - 3.7.* *_cpython | ||
| - 3.8.* *_cpython | ||
| - 3.9.* *_cpython | ||
| - 3.10.* *_cpython | ||
| - 3.11.* *_cpython # new entry | ||
| - 3.6.* *_73_pypy | ||
| - 3.7.* *_73_pypy | ||
| - 3.8.* *_73_pypy | ||
| - 3.9.* *_73_pypy | ||
| paused: false | ||
| longterm: True | ||
| pr_limit: 5 | ||
| exclude: | ||
| # this shouldn't attempt to modify the python feedstocks | ||
| - python | ||
| - pypy3.6 | ||
| - pypy-meta | ||
|
|
||
| python: | ||
| - 3.11.* *_cpython | ||
| # additional entries to add for zip_keys | ||
| numpy: | ||
| - 1.23 | ||
| python_impl: | ||
| - cpython | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to list 3.6 and 3.7 here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah was wondering the same thing. Saw this in our PyPy migrator
conda-forge-pinning-feedstock/recipe/migrations/pypy38.yaml
Lines 8 to 9 in 28885e3
Also we had this in the Python 3.10 migrator ( #2008 ) ( even after we dropped Python 3.6, #1955 )
So thinking this is needed for other reasons. Hopefully someone can clarify. Also happy to drop if I've misunderstood
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you link a PR where this migration has been applied locally? If that works, all is fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conda-smithy keeps trying to delete the migrator altogether (as it not merged in conda-forge-pinning). Forgetting the option to tell conda-smithy to override this behavior
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It shouldn't hurt to have superfluous entries. Pretty sure we can remove 3.6.
To remove 3.7 we need to #2623 (comment) :
As per the comment above, this PR should remove 3.7 from the current pinnings already (because AFAIR we currently don't have code to do add+remove in a single migration).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've made a PR in conda-forge/pytest-feedstock#152
(The option is
--exclusive-config-file ../conda-forge-pinning-feedstock/recipe/conda_build_config.yaml)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(NB: If there surfaced new/other (good/important) reasons to drop it after the migration, that's fine by me. I was just reciting the comment/core decision from a few months back.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah ok was looking for a way to drop Python 3.7 in the migration, but didn't see it. Went ahead and deleted from the pinning file directly 👍
Thanks Chris! 🙏 Yeah had tried that option, but it was still deleting it for me. Probably missing something. Maybe it matters what the path to the pinning file is? In any event, looks like the PR is doing the right thing, which is encouraging 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It needs to be able to find the correct
migrations/folder next toconda_build_config.yamlso perhaps that was your issue?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see. Thanks for clarifying! 🙏
Yeah probably. Was trying to point it to
conda_build_config.yamlinstalled inbaseas opposed to a feedstock, which would not be adjacent tomigrations/😅