Commit 8e8aa44c by David Hotham Committed by Bjorn Neergaard

normalized name when registering package at upload

parent 1215ba8f
...@@ -77,13 +77,10 @@ class Uploader: ...@@ -77,13 +77,10 @@ class Uploader:
def files(self) -> list[Path]: def files(self) -> list[Path]:
dist = self._poetry.file.parent / "dist" dist = self._poetry.file.parent / "dist"
version = self._package.version.to_string() version = self._package.version.to_string()
escaped_name = distribution_name(self._package.name)
wheels = list( wheels = list(dist.glob(f"{escaped_name}-{version}-*.whl"))
dist.glob(f"{distribution_name(self._package.name)}-{version}-*.whl") tars = list(dist.glob(f"{escaped_name}-{version}.tar.gz"))
)
tars = list(
dist.glob(f"{distribution_name(self._package.name)}-{version}.tar.gz")
)
return sorted(wheels + tars) return sorted(wheels + tars)
...@@ -303,7 +300,8 @@ class Uploader: ...@@ -303,7 +300,8 @@ class Uploader:
Register a package to a repository. Register a package to a repository.
""" """
dist = self._poetry.file.parent / "dist" dist = self._poetry.file.parent / "dist"
file = dist / f"{self._package.name}-{self._package.version.to_string()}.tar.gz" escaped_name = distribution_name(self._package.name)
file = dist / f"{escaped_name}-{self._package.version.to_string()}.tar.gz"
if not file.exists(): if not file.exists():
raise RuntimeError(f'"{file.name}" does not exist.') raise RuntimeError(f'"{file.name}" does not exist.')
......
...@@ -11,7 +11,6 @@ from pathlib import Path ...@@ -11,7 +11,6 @@ from pathlib import Path
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from typing import Any from typing import Any
from poetry.core.masonry.utils.helpers import distribution_name
from poetry.core.packages.package import Package from poetry.core.packages.package import Package
from poetry.core.packages.utils.link import Link from poetry.core.packages.utils.link import Link
from poetry.core.toml.file import TOMLFile from poetry.core.toml.file import TOMLFile
...@@ -235,7 +234,7 @@ class TestRepository(Repository): ...@@ -235,7 +234,7 @@ class TestRepository(Repository):
def find_links_for_package(self, package: Package) -> list[Link]: def find_links_for_package(self, package: Package) -> list[Link]:
return [ return [
Link( Link(
f"https://foo.bar/files/{distribution_name(package.name)}" f"https://foo.bar/files/{package.name.replace('-', '_')}"
f"-{package.version.to_string()}-py2.py3-none-any.whl" f"-{package.version.to_string()}-py2.py3-none-any.whl"
) )
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment