Fix extracting extras from markers with many extras#2792
Merged
gaborbernat merged 2 commits intotox-dev:mainfrom Dec 31, 2022
Merged
Fix extracting extras from markers with many extras#2792gaborbernat merged 2 commits intotox-dev:mainfrom
gaborbernat merged 2 commits intotox-dev:mainfrom
Conversation
Contributor
Author
|
What should be done with requirements like requires = [
Requirement('filelock<4.0.0,>=3.9.0; extra == "extras1" or extra == "extras2"'),
Requirement('sphinx>=3; extra == "extras1" and extra == "extras2"')
]
result = dependencies_with_extras(requires, {"extras1"}, "")What result is expected? |
Contributor
Author
|
Maybe its a bug in the poetry build backend, because setuptools makes different METADATA Requires-Dists |
Member
I'd say only filelock to show up, as sphinx needs both extra enabled.
Worth reporting it to them, but I think is valid to expect if something generates such to behave as my previous paragraph here describes. Can you add a test for it? |
gaborbernat
requested changes
Dec 30, 2022
|
|
||
|
|
||
| def test_load_dependency_poetry_many_extra() -> None: | ||
| requires = [Requirement('filelock<4.0.0,>=3.9.0; extra == "extras1" or extra == "extras2"')] |
Member
There was a problem hiding this comment.
instead of naming it poetry let's just say it extra_or 👍 And lets add an extra_and variant please?
Signed-off-by: Bernát Gábor <gaborjbernat@gmail.com>
gaborbernat
approved these changes
Dec 31, 2022
Member
gaborbernat
left a comment
There was a problem hiding this comment.
Let's ship as is and do the and handling as a follow-up.
Contributor
Author
|
@gaborbernat How many logic markers should tox handle? One? |
descope bot
referenced
this pull request
in descope/django-descope
Jan 14, 2023
This PR contains the following updates: | Package | Type | Update | Change | Pending | |---|---|---|---|---| | [tox](https://togithub.com/tox-dev/tox) ([changelog](https://tox.wiki/en/latest/changelog.html)) | dev | patch | `4.1.1` -> `4.1.2` | `4.2.8` (+9) | --- ### Release Notes <details> <summary>tox-dev/tox</summary> ### [`v4.1.2`](https://togithub.com/tox-dev/tox/releases/tag/4.1.2) [Compare Source](https://togithub.com/tox-dev/tox/compare/4.1.1...4.1.2) #### What's Changed - Fix --skip-missing-interpreters by [@​q0w](https://togithub.com/q0w) in [https://github.com/tox-dev/tox/pull/2793](https://togithub.com/tox-dev/tox/pull/2793) - Show installed packages after setup in CI envs by [@​gaborbernat](https://togithub.com/gaborbernat) in [https://github.com/tox-dev/tox/pull/2794](https://togithub.com/tox-dev/tox/pull/2794) - Fix extracting extras from markers with many extras by [@​q0w](https://togithub.com/q0w) in [https://github.com/tox-dev/tox/pull/2792](https://togithub.com/tox-dev/tox/pull/2792) **Full Changelog**: tox-dev/tox@4.1.1...4.1.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC45OS4yIiwidXBkYXRlZEluVmVyIjoiMzQuOTkuMiJ9--> Co-authored-by: descope[bot] <descope[bot]@users.noreply.github.com>
This was referenced Jun 6, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Thanks for contribution
Please, make sure you address all the checklists (for details on how see
development documentation)!
tox -e fix)docs/changelogfolder