Fix "Wheel naming is not following PEP 491 convention"

newsfragments/4766.bugfix.rst

@@ -0,0 +1 @@
+Fix wheel file naming to follow binary distribution specification -- by :user:`di`

setuptools/_normalization.py

@@ -134,7 +134,13 @@ def filename_component_broken(value: str) -> str:
 def safer_name(value: str) -> str:
     """Like ``safe_name`` but can be used as filename component for wheel"""
     # See bdist_wheel.safer_name
-    return filename_component(safe_name(value))
+    return (
+        # Per https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
+        re.sub(r"[-_.]+", "-", safe_name(value))
+        .lower()
+        # Per https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
+        .replace("-", "_")
+    )
 
 
 def safer_best_effort_version(value: str) -> str:

setuptools/command/bdist_wheel.py

@@ -134,7 +134,13 @@ def get_abi_tag() -> str | None:
 
 
 def safer_name(name: str) -> str:
-    return safe_name(name).replace("-", "_")
+    return (
+        # Per https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
+        re.sub(r"[-_.]+", "-", safe_name(name))
+        .lower()
+        # Per https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
+        .replace("-", "_")
+    )
 
 
 def safer_version(version: str) -> str:

setuptools/tests/test_bdist_wheel.py

@@ -246,9 +246,9 @@ def test_no_scripts(wheel_paths):
 
 
 def test_unicode_record(wheel_paths):
-    path = next(path for path in wheel_paths if "unicode.dist" in path)
+    path = next(path for path in wheel_paths if "unicode_dist" in path)
     with ZipFile(path) as zf:
-        record = zf.read("unicode.dist-0.1.dist-info/RECORD")
+        record = zf.read("unicode_dist-0.1.dist-info/RECORD")
 
     assert "åäö_日本語.py".encode() in record
 

setuptools/tests/test_dist_info.py

@@ -188,7 +188,7 @@ def test_dist_info_is_the_same_as_in_wheel(
         dist_info = next(tmp_path.glob("dir_dist/*.dist-info"))
 
         assert dist_info.name == wheel_dist_info.name
-        assert dist_info.name.startswith(f"{name.replace('-', '_')}-{version}{suffix}")
+        assert dist_info.name.startswith(f"my_proj-{version}{suffix}")
         for file in "METADATA", "entry_points.txt":
             assert read(dist_info / file) == read(wheel_dist_info / file)
 

setuptools/tests/test_easy_install.py

@@ -670,11 +670,11 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
 
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
-                foobar_1_archive = os.path.join(temp_dir, 'foo.bar-0.1.tar.gz')
-                make_nspkg_sdist(foobar_1_archive, 'foo.bar', '0.1')
+                foobar_1_archive = os.path.join(temp_dir, 'foo_bar-0.1.tar.gz')
+                make_nspkg_sdist(foobar_1_archive, 'foo_bar', '0.1')
                 # Now actually go ahead an extract to the temp dir and add the
                 # extracted path to sys.path so foo.bar v0.1 is importable
-                foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1')
+                foobar_1_dir = os.path.join(temp_dir, 'foo_bar-0.1')
                 os.mkdir(foobar_1_dir)
                 with tarfile.open(foobar_1_archive) as tf:
                     tf.extraction_filter = lambda member, path: member
@@ -697,14 +697,14 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
                             len(foo.__path__) == 2):
                         print('FAIL')
 
-                    if 'foo.bar-0.2' not in foo.__path__[0]:
+                    if 'foo_bar-0.2' not in foo.__path__[0]:
                         print('FAIL')
                 """
                 )
 
                 test_pkg = create_setup_requires_package(
                     temp_dir,
-                    'foo.bar',
+                    'foo_bar',
                     '0.2',
                     make_nspkg_sdist,
                     template,
@@ -718,8 +718,8 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
                         # Don't even need to install the package, just
                         # running the setup.py at all is sufficient
                         run_setup(test_setup_py, ['--name'])
-                    except pkg_resources.VersionConflict:
-                        self.fail(
+                    except pkg_resources.VersionConflict:  # pragma: nocover
+                        pytest.fail(
                             'Installing setup.py requirements caused a VersionConflict'
                         )
 
@@ -1120,8 +1120,10 @@ def make_nspkg_sdist(dist_path, distname, version):
     package with the same name as distname.  The top-level package is
     designated a namespace package).
     """
-
-    parts = distname.split('.')
+    # The project name might not contain periods. Replace dashes and
+    # underscores with periods before constructing the namespace.
+    namespace = distname.replace('-', '.').replace('_', '.')
+    parts = namespace.split('.')
     nspackage = parts[0]
 
     packages = ['.'.join(parts[:idx]) for idx in range(1, len(parts) + 1)]