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
14 changes: 11 additions & 3 deletions src/poetry_plugin_export/walker.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,18 @@ def get_project_dependency_packages2(
continue

marker = info.get_marker(groups)
if not marker.validate({"extra": extras}):
continue
try:
marker = marker.apply({"extra": extras}) # type: ignore[attr-defined]
except AttributeError:
# poetry-core <= 1.4.2
if not marker.validate({"extra": extras}):
continue

marker = marker.without_extras()
marker = marker.without_extras()

else:
if marker.is_empty():
continue

if project_python_marker:
marker = project_python_marker.intersect(marker)
Expand Down
3 changes: 2 additions & 1 deletion tests/test_exporter_pylock_toml.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from poetry.core.constraints.version import Version
from poetry.core.packages.dependency_group import MAIN_GROUP
from poetry.core.packages.package import Package
from poetry.core.version.markers import BaseMarker
from poetry.factory import Factory
from poetry.packages import Locker as BaseLocker
from poetry.repositories import Repository
Expand Down Expand Up @@ -974,7 +975,7 @@ def test_export_legacy_repo_dependencies(tmp_path: Path, poetry: Poetry) -> None
{"main"},
{"extra1"},
'python_version >= "3.6" or extra == "extra1"',
'python_version >= "3.6"',
"*" if hasattr(BaseMarker, "apply") else 'python_version >= "3.6"',
),
({"main"}, {"extra1"}, 'python_version >= "3.6" and extra != "extra1"', ""),
],
Expand Down
Loading