Skip to content

Commit d5f7bfe

Browse files
authored
Fix version metadata to preserve leading zeros in CalVer (#2398)
1 parent cbfc465 commit d5f7bfe

4 files changed

Lines changed: 39 additions & 6 deletions

File tree

‎backend/src/hatchling/metadata/core.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def __init__(
5757
self._dynamic: list[str] | None = None
5858
self._name: str | None = None
5959
self._version: str | None = None
60+
self._original_version: str | None = None
6061
self._project_file: str | None = None
6162

6263
# App already loaded config
@@ -153,6 +154,20 @@ def version(self) -> str:
153154

154155
return self._version
155156

157+
@property
158+
def original_version(self) -> str:
159+
"""
160+
The version as written by the user, before PEP 440 normalization.
161+
162+
The normalized `version` is used for distribution file names and `.dist-info`
163+
directories, but core metadata records the original string so that stylized
164+
versions (e.g. CalVer `2026.08.10`) appear as intended on package indexes.
165+
"""
166+
if self._original_version is None:
167+
self._version = self._get_version()
168+
169+
return cast(str, self._original_version)
170+
156171
@property
157172
def config(self) -> dict[str, Any]:
158173
if self._config is None:
@@ -260,6 +275,7 @@ def _get_version(self, core_metadata: CoreMetadata | None = None) -> str:
260275
message = f"Invalid version `{version}` from {source}, see https://peps.python.org/pep-0440/"
261276
raise ValueError(message) from None
262277
else:
278+
self._original_version = version
263279
return normalized_version
264280

265281
def validate_fields(self) -> None:

‎backend/src/hatchling/metadata/spec.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def construct_metadata_file_1_2(metadata: ProjectMetadata[Any], extra_dependenci
222222
"""
223223
metadata_file = "Metadata-Version: 1.2\n"
224224
metadata_file += f"Name: {metadata.core.raw_name}\n"
225-
metadata_file += f"Version: {metadata.version}\n"
225+
metadata_file += f"Version: {metadata.original_version}\n"
226226

227227
if metadata.core.description:
228228
metadata_file += f"Summary: {metadata.core.description}\n"
@@ -283,7 +283,7 @@ def construct_metadata_file_2_1(metadata: ProjectMetadata[Any], extra_dependenci
283283
"""
284284
metadata_file = "Metadata-Version: 2.1\n"
285285
metadata_file += f"Name: {metadata.core.raw_name}\n"
286-
metadata_file += f"Version: {metadata.version}\n"
286+
metadata_file += f"Version: {metadata.original_version}\n"
287287

288288
if metadata.core.description:
289289
metadata_file += f"Summary: {metadata.core.description}\n"
@@ -360,7 +360,7 @@ def construct_metadata_file_2_2(metadata: ProjectMetadata[Any], extra_dependenci
360360
"""
361361
metadata_file = "Metadata-Version: 2.2\n"
362362
metadata_file += f"Name: {metadata.core.raw_name}\n"
363-
metadata_file += f"Version: {metadata.version}\n"
363+
metadata_file += f"Version: {metadata.original_version}\n"
364364

365365
if metadata.core.dynamic:
366366
# Ordered set
@@ -446,7 +446,7 @@ def construct_metadata_file_2_3(metadata: ProjectMetadata[Any], extra_dependenci
446446
"""
447447
metadata_file = "Metadata-Version: 2.3\n"
448448
metadata_file += f"Name: {metadata.core.raw_name}\n"
449-
metadata_file += f"Version: {metadata.version}\n"
449+
metadata_file += f"Version: {metadata.original_version}\n"
450450

451451
if metadata.core.dynamic:
452452
# Ordered set
@@ -532,7 +532,7 @@ def construct_metadata_file_2_4(metadata: ProjectMetadata[Any], extra_dependenci
532532
"""
533533
metadata_file = "Metadata-Version: 2.4\n"
534534
metadata_file += f"Name: {metadata.core.raw_name}\n"
535-
metadata_file += f"Version: {metadata.version}\n"
535+
metadata_file += f"Version: {metadata.original_version}\n"
536536

537537
if metadata.core.dynamic:
538538
# Ordered set
@@ -623,7 +623,7 @@ def construct_metadata_file_2_5(metadata: ProjectMetadata, extra_dependencies: t
623623
"""
624624
metadata_file = "Metadata-Version: 2.5\n"
625625
metadata_file += f"Name: {metadata.core.raw_name}\n"
626-
metadata_file += f"Version: {metadata.version}\n"
626+
metadata_file += f"Version: {metadata.original_version}\n"
627627

628628
if metadata.core.import_names is not None:
629629
if not metadata.core.import_names and not metadata.core.import_namespaces:

‎tests/backend/metadata/test_core.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,12 @@ def test_static_normalization(self, isolation):
228228
assert metadata.version == metadata.version == "0.1.0.0rc1"
229229
assert metadata.core.version == metadata.core.version == "0.1.0.0-rc.1"
230230

231+
def test_original_version_preserved(self, isolation):
232+
metadata = ProjectMetadata(str(isolation), None, {"project": {"version": "2026.08.10"}})
233+
234+
assert metadata.version == "2026.8.10"
235+
assert metadata.original_version == metadata.original_version == "2026.08.10"
236+
231237
def test_dynamic_missing(self, isolation):
232238
metadata = ProjectMetadata(str(isolation), None, {"project": {"dynamic": ["version"]}, "tool": {"hatch": {}}})
233239

‎tests/backend/metadata/test_spec.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,6 +2400,17 @@ def test_all(self, constructor, temp_dir, helpers):
24002400

24012401
@pytest.mark.parametrize("constructor", [get_core_metadata_constructors()["2.5"]])
24022402
class TestCoreMetadataV25:
2403+
def test_original_version_preserved(self, constructor, isolation, helpers):
2404+
metadata = ProjectMetadata(str(isolation), None, {"project": {"name": "My.App", "version": "2026.08.10"}})
2405+
2406+
assert constructor(metadata) == helpers.dedent(
2407+
"""
2408+
Metadata-Version: 2.5
2409+
Name: My.App
2410+
Version: 2026.08.10
2411+
"""
2412+
)
2413+
24032414
def test_import_names(self, constructor, isolation, helpers):
24042415
metadata = ProjectMetadata(
24052416
str(isolation),

0 commit comments

Comments
 (0)