Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/poetry/core/packages/dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,10 @@ def marker(self, marker: str | BaseMarker) -> None:
for _extra in extra_values:
if not _extra.startswith("!="):
new_in_extras.append(canonicalize_name(_extra))
self._in_extras = [*self._in_extras, *new_in_extras]
self._in_extras = [
*self._in_extras,
*(e for e in new_in_extras if e not in self._in_extras),
]

# Recalculate python versions.
self._python_versions = "*"
Expand Down
2 changes: 2 additions & 0 deletions src/poetry/core/packages/dependency_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ def _enrich_dependency(
dependency._develop = poetry_dependency._develop # type: ignore[has-type]
else:
dependency = poetry_dependency.with_features(project_dependency.features)
dependency._optional = project_dependency.is_optional() # type: ignore[has-type]
dependency._in_extras = project_dependency.in_extras

dependency.constraint = constraint
dependency.marker = marker
Expand Down
37 changes: 37 additions & 0 deletions tests/packages/test_dependency_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,40 @@ def test_remove_dependency_removes_from_both_lists() -> None:
),
# extras - special
# root extras do not have an extra marker, they just have set _in_extras!
(
[
create_dependency(
"foo", source_name="src", optional=True, in_extras=("extra1",)
)
],
[create_dependency("foo", source_name="src", optional=True)],
[
create_dependency(
"foo", source_name="src", optional=True, in_extras=("extra1",)
)
],
),
(
[
create_dependency(
"foo", source_name="src", optional=True, in_extras=("extra1",)
)
],
[create_dependency("foo", source_name="src")],
(
[
create_dependency(
"foo", source_name="src", optional=True, in_extras=("extra1",)
)
],
[
create_dependency(
"foo", source_name="src", optional=True, in_extras=("extra1",)
),
create_dependency("foo", source_name="src"),
],
),
),
(
[
Dependency.create_from_pep_508("foo;extra!='extra1'"),
Expand Down Expand Up @@ -463,6 +497,9 @@ def test_dependencies_for_locking(
assert [d.in_extras for d in group.dependencies_for_locking] == [
d.in_extras for d in expected_dependencies
]
assert [d.is_optional() for d in group.dependencies_for_locking] == [
d.is_optional() for d in expected_dependencies
]


@pytest.mark.parametrize(
Expand Down
Loading