Merge tag 'v69.4.1' into main

pypa · Apr 13, 2024 · 6ac1f6e · 6ac1f6e
2 parents 762bdcb + d4affe0
commit 6ac1f6e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 69.4.0
+current_version = 69.4.1
 commit = True
 tag = True
 

diff --git a/NEWS.rst b/NEWS.rst
@@ -1,3 +1,18 @@
+v69.4.1
+=======
+
+No significant changes.
+
+
+v69.3.1
+=======
+
+Bugfixes
+--------
+
+- Remove attempt to canonicalize the version. It's already canonical enough. (#4302)
+
+
 v69.4.0
 =======
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 69.4.0
+version = 69.4.1
 author = Python Packaging Authority
 author_email = [email protected]
 description = Easily download, build, install, upgrade, and uninstall Python packages

diff --git a/setuptools/_core_metadata.py b/setuptools/_core_metadata.py
@@ -17,7 +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.utils import canonicalize_name
 from .extern.packaging.version import Version
 from .warnings import SetuptoolsDeprecationWarning
 
@@ -264,5 +264,5 @@ def _write_provides_extra(file, processed_extras, safe, unsafe):
 def get_fullname(self):
     return "{}-{}".format(
         canonicalize_name(self.get_name()).replace('-', '_'),
-        canonicalize_version(self.get_version()),
+        self.get_version(),
     )
diff --git a/setuptools/tests/test_config_discovery.py b/setuptools/tests/test_config_discovery.py
@@ -255,7 +255,7 @@ def test_py_modules_when_wheel_dir_is_cwd(self, tmp_path):
 
 
 class TestNoConfig:
-    CANONICAL_DEFAULT_VERSION = "0"  # Canonical default version given by setuptools
+    DEFAULT_VERSION = "0.0.0"  # Default version given by setuptools
 
     EXAMPLES = {
         "pkg1": ["src/pkg1.py"],
@@ -277,9 +277,7 @@ 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.CANONICAL_DEFAULT_VERSION}.tar.gz"
-        )
+        dist_file = tmp_path / f"dist/ns_nested_pkg-{self.DEFAULT_VERSION}.tar.gz"
         assert dist_file.is_file()