Skip to content

Commit df45427

Browse files
committed
Remove attempt to canonicalize the version. It's already canonical enough.
Closes pypa#4302 Closes pypa#3593
1 parent 92b45e9 commit df45427

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

newsfragments/4302.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove attempt to canonicalize the version. It's already canonical enough.

setuptools/_core_metadata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from . import _normalization, _reqs
1818
from .extern.packaging.markers import Marker
1919
from .extern.packaging.requirements import Requirement
20-
from .extern.packaging.utils import canonicalize_name, canonicalize_version
20+
from .extern.packaging.utils import canonicalize_name
2121
from .extern.packaging.version import Version
2222
from .warnings import SetuptoolsDeprecationWarning
2323

@@ -264,5 +264,5 @@ def _write_provides_extra(file, processed_extras, safe, unsafe):
264264
def get_fullname(self):
265265
return "{}-{}".format(
266266
canonicalize_name(self.get_name()).replace('-', '_'),
267-
canonicalize_version(self.get_version()),
267+
self.get_version(),
268268
)

setuptools/tests/test_config_discovery.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def test_py_modules_when_wheel_dir_is_cwd(self, tmp_path):
255255

256256

257257
class TestNoConfig:
258-
CANONICAL_DEFAULT_VERSION = "0" # Canonical default version given by setuptools
258+
DEFAULT_VERSION = "0.0.0" # Default version given by setuptools
259259

260260
EXAMPLES = {
261261
"pkg1": ["src/pkg1.py"],
@@ -277,9 +277,7 @@ def test_build_with_discovered_name(self, tmp_path):
277277
_populate_project_dir(tmp_path, files, {})
278278
_run_build(tmp_path, "--sdist")
279279
# Expected distribution file
280-
dist_file = (
281-
tmp_path / f"dist/ns_nested_pkg-{self.CANONICAL_DEFAULT_VERSION}.tar.gz"
282-
)
280+
dist_file = tmp_path / f"dist/ns_nested_pkg-{self.DEFAULT_VERSION}.tar.gz"
283281
assert dist_file.is_file()
284282

285283

0 commit comments

Comments
 (0)