Skip to content

Commit 3faf98f

Browse files
dimblebyneersighted
authored andcommitted
normalized name when registering package at upload
(cherry picked from commit 8e8aa44)
1 parent 67c505d commit 3faf98f

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/poetry/publishing/uploader.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,10 @@ def adapter(self) -> adapters.HTTPAdapter:
7777
def files(self) -> list[Path]:
7878
dist = self._poetry.file.parent / "dist"
7979
version = self._package.version.to_string()
80+
escaped_name = distribution_name(self._package.name)
8081

81-
wheels = list(
82-
dist.glob(f"{distribution_name(self._package.name)}-{version}-*.whl")
83-
)
84-
tars = list(
85-
dist.glob(f"{distribution_name(self._package.name)}-{version}.tar.gz")
86-
)
82+
wheels = list(dist.glob(f"{escaped_name}-{version}-*.whl"))
83+
tars = list(dist.glob(f"{escaped_name}-{version}.tar.gz"))
8784

8885
return sorted(wheels + tars)
8986

@@ -302,7 +299,8 @@ def _register(self, session: requests.Session, url: str) -> requests.Response:
302299
Register a package to a repository.
303300
"""
304301
dist = self._poetry.file.parent / "dist"
305-
file = dist / f"{self._package.name}-{self._package.version.to_string()}.tar.gz"
302+
escaped_name = distribution_name(self._package.name)
303+
file = dist / f"{escaped_name}-{self._package.version.to_string()}.tar.gz"
306304

307305
if not file.exists():
308306
raise RuntimeError(f'"{file.name}" does not exist.')

tests/helpers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from typing import TYPE_CHECKING
1212
from typing import Any
1313

14-
from poetry.core.masonry.utils.helpers import distribution_name
1514
from poetry.core.packages.package import Package
1615
from poetry.core.packages.utils.link import Link
1716
from poetry.core.toml.file import TOMLFile
@@ -235,7 +234,7 @@ def find_packages(self, dependency: Dependency) -> list[Package]:
235234
def find_links_for_package(self, package: Package) -> list[Link]:
236235
return [
237236
Link(
238-
f"https://foo.bar/files/{distribution_name(package.name)}"
237+
f"https://foo.bar/files/{package.name.replace('-', '_')}"
239238
f"-{package.version.to_string()}-py2.py3-none-any.whl"
240239
)
241240
]

0 commit comments

Comments
 (0)