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
7 changes: 5 additions & 2 deletions src/packaging/specifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1179,8 +1179,11 @@ def filter(
return (
item
for item in iterable
if (version := _coerce_version(item)) is None
or not version.is_prerelease
if (
(version := _coerce_version(item if key is None else key(item)))
is None
or not version.is_prerelease
)
)

# PEP 440: exclude prereleases unless no final releases matched
Expand Down
22 changes: 22 additions & 0 deletions tests/test_specifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1440,6 +1440,28 @@ def test_specifierset_filter_with_key(
expected = [items[index] for index in expected_indexes]
assert result == expected

@pytest.mark.parametrize(
("prereleases", "expected_indexes"),
[
(None, [1]),
(True, [0, 1]),
(False, [1]),
],
)
def test_empty_specifierset_filter_with_key(
self, prereleases: bool | None, expected_indexes: list[int]
) -> None:
items = [
{"version": "2.0a1"},
{"version": "2.1"},
]

spec = SpecifierSet("", prereleases=prereleases)
result = list(spec.filter(items, key=lambda item: item["version"]))

expected = [items[index] for index in expected_indexes]
assert result == expected

@pytest.mark.parametrize(
("specifier", "prereleases", "input", "expected"),
[
Expand Down
Loading