Merge pull request pypa#4286 from di/fix/3593

Support PEP 625

Author: jaraco

newsfragments/3593.feature.rst

@@ -0,0 +1 @@
+Support PEP 625 by canonicalizing package name and version in filenames.

setuptools/_core_metadata.py

@@ -17,6 +17,7 @@
 from . import _normalization, _reqs
 from .extern.packaging.markers import Marker
 from .extern.packaging.requirements import Requirement
+from .extern.packaging.utils import canonicalize_name, canonicalize_version
 from .extern.packaging.version import Version
 from .warnings import SetuptoolsDeprecationWarning
 
@@ -257,3 +258,11 @@ def _write_provides_extra(file, processed_extras, safe, unsafe):
     else:
         processed_extras[safe] = unsafe
         file.write(f"Provides-Extra: {safe}\n")
+
+
+# from pypa/distutils#244; needed only until that logic is always available
+def get_fullname(self):
+    return "{}-{}".format(
+        canonicalize_name(self.get_name()).replace('-', '_'),
+        canonicalize_version(self.get_version()),
+    )

setuptools/monkey.py

@@ -95,6 +95,7 @@ def _patch_distribution_metadata():
         'write_pkg_file',
         'read_pkg_file',
         'get_metadata_version',
+        'get_fullname',
     ):
         new_val = getattr(_core_metadata, attr)
         setattr(distutils.dist.DistributionMetadata, attr, new_val)

setuptools/tests/test_config_discovery.py

@@ -255,7 +255,7 @@ def test_py_modules_when_wheel_dir_is_cwd(self, tmp_path):
 
 
 class TestNoConfig:
-    DEFAULT_VERSION = "0.0.0"  # Default version given by setuptools
+    CANONICAL_DEFAULT_VERSION = "0"  # Canonical default version given by setuptools
 
     EXAMPLES = {
         "pkg1": ["src/pkg1.py"],
@@ -277,7 +277,9 @@ def test_build_with_discovered_name(self, tmp_path):
         _populate_project_dir(tmp_path, files, {})
         _run_build(tmp_path, "--sdist")
         # Expected distribution file
-        dist_file = tmp_path / f"dist/ns.nested.pkg-{self.DEFAULT_VERSION}.tar.gz"
+        dist_file = (
+            tmp_path / f"dist/ns_nested_pkg-{self.CANONICAL_DEFAULT_VERSION}.tar.gz"
+        )
         assert dist_file.is_file()