diff --git a/docs/changelog/2791.bugfix.rst b/docs/changelog/2791.bugfix.rst new file mode 100644 index 0000000000..172874be54 --- /dev/null +++ b/docs/changelog/2791.bugfix.rst @@ -0,0 +1 @@ +Fix extracting extras from markers with many extras - by :user:`q0w`. diff --git a/src/tox/tox_env/python/virtual_env/package/util.py b/src/tox/tox_env/python/virtual_env/package/util.py index 5139e7bacd..e57efee972 100644 --- a/src/tox/tox_env/python/virtual_env/package/util.py +++ b/src/tox/tox_env/python/virtual_env/package/util.py @@ -45,10 +45,9 @@ def extract_extra_markers(deps: list[Requirement]) -> list[tuple[Requirement, se extra_markers.add(marker_value.value) del markers[_at] _at -= 1 - if _at > 0 and (isinstance(markers[_at], str) and markers[_at] in ("and", "or")): + if _at >= 0 and (isinstance(markers[_at], str) and markers[_at] in ("and", "or")): del markers[_at] if len(markers) == 0: req.marker = None - break result.append((req, extra_markers or {None})) return result diff --git a/tests/tox_env/python/virtual_env/package/test_python_package_util.py b/tests/tox_env/python/virtual_env/package/test_python_package_util.py index bac77d8f7f..5b58430b81 100644 --- a/tests/tox_env/python/virtual_env/package/test_python_package_util.py +++ b/tests/tox_env/python/virtual_env/package/test_python_package_util.py @@ -51,6 +51,15 @@ def test_load_dependency_many_extra(pkg_with_extras: PathDistribution) -> None: assert str(left) == str(right) +def test_load_dependency_poetry_many_extra() -> None: + requires = [Requirement('filelock<4.0.0,>=3.9.0; extra == "extras1" or extra == "extras2"')] + result = dependencies_with_extras(requires, {"extras1"}, "") + exp = [Requirement("filelock<4.0.0,>=3.9.0")] + for left, right in zip_longest(result, exp): + assert isinstance(right, Requirement) + assert str(left) == str(right) + + def test_loads_deps_recursive_extras() -> None: requires = [ Requirement("no-extra"),