fix: correctly parse source distribution names with hyphens

CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/).
 
 
+## 2.0.1 - 2024-01-14
+
+### Fixed
+
+- Correctly parse source distribution names with hyphens, since setuptools does not
+  produce normalised names. See
+  [pypa/setuptools#3593](https://github.com/pypa/setuptools/issues/3593).
+
+
 ## 2.0.0 - 2024-01-06
 
 ### Added

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "s3pypi"
-version = "2.0.0"
+version = "2.0.1"
 description = "CLI for creating a Python Package Repository in an S3 bucket"
 authors = [
     "Matteo De Wint <[email protected]>",

s3pypi/__init__.py

@@ -1,2 +1,2 @@
 __prog__ = "s3pypi"
-__version__ = "2.0.0"
+__version__ = "2.0.1"

s3pypi/core.py

@@ -87,7 +87,14 @@ def parse_distribution_id(filename: str) -> DistributionId:
     if not ext:
         raise S3PyPiError(f"Unknown file type: {filename}")
 
-    name, version = filename[: -len(ext)].split("-", 2)[:2]
+    stem = filename[: -len(ext)]
+
+    if ext == ".whl":
+        name, version = stem.split("-", 2)[:2]
+    else:
+        name, version = stem.rsplit("-", 1)
+        name = name.replace("-", "_")
+
     return DistributionId(name, version)
 
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 2.0.1
 commit = True
 message = chore: bump version to {new_version}
 

tests/unit/test_core.py

@@ -18,6 +18,7 @@ def test_normalize_package_name(name, normalized):
 @pytest.mark.parametrize(
     "filename, dist",
     [
+        ("hello-world-0.1.0.tar.gz", core.DistributionId("hello_world", "0.1.0")),
         ("hello_world-0.1.0.tar.gz", core.DistributionId("hello_world", "0.1.0")),
         ("foo_bar-1.2.3-py3-none-any.whl", core.DistributionId("foo_bar", "1.2.3")),
     ],