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
4 changes: 2 additions & 2 deletions src/packaging/pylock.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
@property
def filename(self) -> str:
"""Get the filename of the sdist."""
filename = self.name or _url_name(self.url) or _path_name(self.path)
filename = self.name or _path_name(self.path) or _url_name(self.url)
if not filename:
raise PylockValidationError("Cannot determine sdist filename")
return filename
Expand Down Expand Up @@ -501,7 +501,7 @@ def _from_dict(cls, d: Mapping[str, Any]) -> Self:
@property
def filename(self) -> str:
"""Get the filename of the wheel."""
filename = self.name or _url_name(self.url) or _path_name(self.path)
filename = self.name or _path_name(self.path) or _url_name(self.url)
if not filename:
raise PylockValidationError("Cannot determine wheel filename")
return filename
Expand Down
8 changes: 4 additions & 4 deletions tests/test_pylock.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,13 @@ def test_pylock_invalid_vcs() -> None:
"example-2.0.tar.gz",
),
(
# url preferred over path
# path preferred over url
PackageSdist(
url="https://example.com/example-2.0.tar.gz",
path="./example-1.0.tar.gz",
hashes={},
),
"example-2.0.tar.gz",
"example-1.0.tar.gz",
),
# wheels
(
Expand Down Expand Up @@ -402,13 +402,13 @@ def test_pylock_invalid_vcs() -> None:
"example-2.0-py3-none-any.whl",
),
(
# url preferred over path
# path preferred over url
PackageWheel(
url="https://example.com/example-2.0-py3-none-any.whl",
path="./example-1.0-py3-none-any.whl",
hashes={},
),
"example-2.0-py3-none-any.whl",
"example-1.0-py3-none-any.whl",
),
],
)
Expand Down
Loading