Merge branch 'master' into upgrade_ruff

Author: cjames23

backend/src/hatchling/builders/wheel.py

@@ -88,7 +88,9 @@ def __init__(self, project_id: str, *, reproducible: bool) -> None:
     def get_reproducible_time_tuple() -> TIME_TUPLE:
         from datetime import datetime, timezone
 
-        d = datetime.fromtimestamp(get_reproducible_timestamp(), timezone.utc)
+        # `zipfile.ZipInfo` does not support timestamps before 1980
+        min_ts = 315532800  # 1980-01-01T00:00:00Z
+        d = datetime.fromtimestamp(max(get_reproducible_timestamp(), min_ts), timezone.utc)
         return d.year, d.month, d.day, d.hour, d.minute, d.second
 
     def add_file(self, included_file: IncludedFile) -> tuple[str, str, str]:

backend/src/hatchling/version/scheme/standard.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 
 from hatchling.version.scheme.plugin.interface import VersionSchemeInterface
 
@@ -28,13 +28,15 @@ def update(
 
         for version in versions:
             if version == "release":
-                reset_version_parts(original, release=original.release)
+                original = reset_version_parts(original, release=original.release)
             elif version == "major":
-                reset_version_parts(original, release=update_release(original, [original.major + 1]))
+                original = reset_version_parts(original, release=update_release(original, [original.major + 1]))
             elif version == "minor":
-                reset_version_parts(original, release=update_release(original, [original.major, original.minor + 1]))
+                original = reset_version_parts(
+                    original, release=update_release(original, [original.major, original.minor + 1])
+                )
             elif version in {"micro", "patch", "fix"}:
-                reset_version_parts(
+                original = reset_version_parts(
                     original, release=update_release(original, [original.major, original.minor, original.micro + 1])
                 )
             elif version in {"a", "b", "c", "rc", "alpha", "beta", "pre", "preview"}:
@@ -44,13 +46,13 @@ def update(
                     if phase == current_phase:
                         number = current_number + 1
 
-                reset_version_parts(original, pre=(phase, number))
+                original = reset_version_parts(original, pre=(phase, number))
             elif version in {"post", "rev", "r"}:
                 number = 0 if original.post is None else original.post + 1
-                reset_version_parts(original, post=parse_letter_version(version, number))
+                original = reset_version_parts(original, post=number)
             elif version == "dev":
                 number = 0 if original.dev is None else original.dev + 1
-                reset_version_parts(original, dev=(version, number))
+                original = reset_version_parts(original, dev=number)
             else:
                 if len(versions) > 1:
                     message = "Cannot specify multiple update operations with an explicit version"
@@ -66,9 +68,13 @@ def update(
         return str(original)
 
 
-def reset_version_parts(version: Version, **kwargs: Any) -> None:
-    # https://github.com/pypa/packaging/blob/20.9/packaging/version.py#L301-L310
-    internal_version = version._version  # noqa: SLF001
+def reset_version_parts(version: Version, **kwargs: Any) -> Version:
+    """
+    Update version parts and clear all subsequent parts in the sequence.
+
+    When __replace__ is available (packaging 26.0+), returns a new Version instance.
+    Otherwise mutates version via private ._version and returns the same instance.
+    """
     parts: dict[str, Any] = {}
     ordered_part_names = ("epoch", "release", "pre", "post", "dev", "local")
 
@@ -80,9 +86,16 @@ def reset_version_parts(version: Version, **kwargs: Any) -> None:
             parts[part_name] = kwargs[part_name]
             reset = True
         else:
-            parts[part_name] = getattr(internal_version, part_name)
+            parts[part_name] = getattr(version, part_name)
+
+    # Use __replace__ if available for efficiency
+    if hasattr(version, "__replace__"):
+        return version.__replace__(**parts)
 
+    # Reference: https://github.com/pypa/packaging/blob/20.9/packaging/version.py#L301-L310
+    internal_version = version._version  # noqa: SLF001
     version._version = type(internal_version)(**parts)  # noqa: SLF001
+    return version
 
 
 def update_release(original_version: Version, new_release_parts: list[int]) -> tuple[int, ...]:
@@ -92,7 +105,7 @@ def update_release(original_version: Version, new_release_parts: list[int]) -> t
     return tuple(new_release_parts)
 
 
-def parse_letter_version(*args: Any, **kwargs: Any) -> tuple[str, int]:
+def parse_letter_version(*args: Any, **kwargs: Any) -> tuple[Literal["a", "b", "rc"], int]:
     from packaging.version import _parse_letter_version  # noqa: PLC2701
 
-    return cast(tuple[str, int], _parse_letter_version(*args, **kwargs))
+    return cast(tuple[Literal["a", "b", "rc"], int], _parse_letter_version(*args, **kwargs))

docs/history/hatch.md

@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## [1.16.3](https://github.com/pypa/hatch/releases/tag/hatch-v1.16.3) - 2026-01-20 ## {: #hatch-v1.16.3 }
+
 ***Added:***
 
 - Env var for keep-env when an exception occurs during environment creation to enable debugging.
@@ -16,6 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fix issue with self-referential dependencies not being recognized. 
 - Fix incomplete environments created when an exception occurs during creation.
+- Fix dependency-groups not working with when environment is not marked as builder. 
+- Change Keyring to take expect repository URL instead of repository name. 
 
 ## [1.16.2](https://github.com/pypa/hatch/releases/tag/hatch-v1.16.2) - 2025-12-06 ## {: #hatch-v1.16.2 }
 

docs/plugins/builder/wheel.md

@@ -25,6 +25,8 @@ The builder plugin name is `wheel`.
 | `bypass-selection` | `false` | Whether or not to suppress the error when one has not defined any file selection options and all heuristics have failed to determine what to ship |
 | `sbom-files` | | A list of paths to [Software Bill of Materials](https://peps.python.org/pep-0770/) files that will be included in the `.dist-info/sboms/` directory of the wheel |
 
+!!! note
+    Many build frontends will build the wheel from a source distribution. This is the recommended approach, but it means you need to ensure the SBOM files passed to `sbom-files` are also [included in the source distribution](https://hatch.pypa.io/latest/config/build/#file-selection).
 
 ## Versions
 

hatch.toml

@@ -118,6 +118,7 @@ update-ruff = [
 ]
 
 [envs.release]
+workspace.members = ["backend/"]
 detached = true
 installer = "uv"
 

src/hatch/cli/shell/__init__.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
 
+import os
 from typing import TYPE_CHECKING
 
 import click
 
+from hatch.config.constants import AppEnvVars
+
 if TYPE_CHECKING:
     from hatch.cli.application import Application
 
@@ -42,7 +45,7 @@ def shell(app: Application, env_name: str | None, name: str, path: str):  # no c
 
     with app.project.ensure_cwd():
         environment = app.project.get_environment(chosen_env)
-        app.project.prepare_environment(environment)
+        app.project.prepare_environment(environment, keep_env=bool(os.environ.get(AppEnvVars.KEEP_ENV)))
 
         first_run_indicator = app.cache_dir / "shell" / "first_run"
         if not first_run_indicator.is_file():

tests/backend/builders/test_wheel.py

@@ -786,7 +786,14 @@ def test_default_auto_detection(self, hatch, helpers, temp_dir, config_file):
             zip_info = zip_archive.getinfo(f"{metadata_directory}/WHEEL")
             assert zip_info.date_time == (2020, 2, 2, 0, 0, 0)
 
-    def test_default_reproducible_timestamp(self, hatch, helpers, temp_dir, config_file):
+    @pytest.mark.parametrize(
+        ("epoch", "expected_date_time"),
+        [
+            ("0", (1980, 1, 1, 0, 0, 0)),
+            ("1580601700", (2020, 2, 2, 0, 1, 40)),
+        ],
+    )
+    def test_default_reproducible_timestamp(self, hatch, helpers, temp_dir, config_file, epoch, expected_date_time):
         config_file.model.template.plugins["default"]["src-layout"] = False
         config_file.save()
 
@@ -812,7 +819,7 @@ def test_default_reproducible_timestamp(self, hatch, helpers, temp_dir, config_f
         build_path = project_path / "dist"
         build_path.mkdir()
 
-        with project_path.as_cwd(env_vars={"SOURCE_DATE_EPOCH": "1580601700"}):
+        with project_path.as_cwd(env_vars={"SOURCE_DATE_EPOCH": epoch}):
             artifacts = list(builder.build(directory=str(build_path)))
 
         assert len(artifacts) == 1
@@ -837,7 +844,7 @@ def test_default_reproducible_timestamp(self, hatch, helpers, temp_dir, config_f
 
         with zipfile.ZipFile(str(expected_artifact), "r") as zip_archive:
             zip_info = zip_archive.getinfo(f"{metadata_directory}/WHEEL")
-            assert zip_info.date_time == (2020, 2, 2, 0, 1, 40)
+            assert zip_info.date_time == expected_date_time
 
     def test_default_no_reproducible(self, hatch, helpers, temp_dir, config_file):
         config_file.model.template.plugins["default"]["src-layout"] = False

tests/backend/metadata/test_core.py

@@ -1163,7 +1163,7 @@ def test_direct_reference_allowed(self, isolation):
             },
         )
 
-        assert metadata.core.dependencies == ["proj@ git+https://github.com/org/proj.git@v1"]
+        assert metadata.core.dependencies == ["proj @ git+https://github.com/org/proj.git@v1"]
 
     def test_context_formatting(self, isolation, uri_slash_prefix):
         metadata = ProjectMetadata(
@@ -1176,7 +1176,7 @@ def test_context_formatting(self, isolation, uri_slash_prefix):
         )
 
         normalized_path = str(isolation).replace("\\", "/")
-        assert metadata.core.dependencies == [f"proj@ file:{uri_slash_prefix}{normalized_path}"]
+        assert metadata.core.dependencies == [f"proj @ file:{uri_slash_prefix}{normalized_path}"]
 
     def test_correct(self, isolation):
         metadata = ProjectMetadata(
@@ -1343,7 +1343,7 @@ def test_context_formatting(self, isolation, uri_slash_prefix):
         )
 
         normalized_path = str(isolation).replace("\\", "/")
-        assert metadata.core.optional_dependencies == {"foo": [f"proj@ file:{uri_slash_prefix}{normalized_path}"]}
+        assert metadata.core.optional_dependencies == {"foo": [f"proj @ file:{uri_slash_prefix}{normalized_path}"]}
 
     def test_direct_reference_allowed(self, isolation):
         metadata = ProjectMetadata(
@@ -1358,7 +1358,7 @@ def test_direct_reference_allowed(self, isolation):
             },
         )
 
-        assert metadata.core.optional_dependencies == {"foo": ["proj@ git+https://github.com/org/proj.git@v1"]}
+        assert metadata.core.optional_dependencies == {"foo": ["proj @ git+https://github.com/org/proj.git@v1"]}
 
     def test_correct(self, isolation):
         metadata = ProjectMetadata(

tests/backend/metadata/test_spec.py

@@ -216,7 +216,7 @@ def test_dependencies(self):
 Requires-Dist: bar==5; extra == 'feature2'
 Requires-Dist: foo==1; (python_version < '3') and extra == 'feature2'
 Provides-Extra: feature3
-Requires-Dist: baz@ file:///path/to/project ; extra == 'feature3'
+Requires-Dist: baz @ file:///path/to/project ; extra == 'feature3'
 """
         assert project_metadata_from_core_metadata(core_metadata) == {
             "name": "My.App",
@@ -225,7 +225,7 @@ def test_dependencies(self):
             "optional-dependencies": {
                 "feature1": ['bar==5; python_version < "3"', "foo==1"],
                 "feature2": ["bar==5", 'foo==1; python_version < "3"'],
-                "feature3": ["baz@ file:///path/to/project"],
+                "feature3": ["baz @ file:///path/to/project"],
             },
         }
 
@@ -990,7 +990,7 @@ def test_all(self, constructor, helpers, temp_dir):
             Requires-Dist: bar==5; extra == 'feature2'
             Requires-Dist: foo==1; (python_version < '3') and extra == 'feature2'
             Provides-Extra: feature3
-            Requires-Dist: baz@ file:///path/to/project ; extra == 'feature3'
+            Requires-Dist: baz @ file:///path/to/project ; extra == 'feature3'
             Description-Content-Type: text/markdown
 
             test content
@@ -1459,7 +1459,7 @@ def test_all(self, constructor, helpers, temp_dir):
             Requires-Dist: bar==5; extra == 'feature2'
             Requires-Dist: foo==1; (python_version < '3') and extra == 'feature2'
             Provides-Extra: feature3
-            Requires-Dist: baz@ file:///path/to/project ; extra == 'feature3'
+            Requires-Dist: baz @ file:///path/to/project ; extra == 'feature3'
             Description-Content-Type: text/markdown
 
             test content
@@ -1898,7 +1898,7 @@ def test_all(self, constructor, temp_dir, helpers):
             Requires-Dist: bar==5; extra == 'feature2'
             Requires-Dist: foo==1; (python_version < '3') and extra == 'feature2'
             Provides-Extra: feature3
-            Requires-Dist: baz@ file:///path/to/project ; extra == 'feature3'
+            Requires-Dist: baz @ file:///path/to/project ; extra == 'feature3'
             Description-Content-Type: text/markdown
 
             test content
@@ -2364,7 +2364,7 @@ def test_all(self, constructor, temp_dir, helpers):
             Requires-Dist: bar==5; extra == 'feature2'
             Requires-Dist: foo==1; (python_version < '3') and extra == 'feature2'
             Provides-Extra: feature3
-            Requires-Dist: baz@ file:///path/to/project ; extra == 'feature3'
+            Requires-Dist: baz @ file:///path/to/project ; extra == 'feature3'
             Description-Content-Type: text/markdown
 
             test content

tests/cli/dep/show/test_table.py

@@ -69,7 +69,7 @@ def test_project_only(hatch, helpers, temp_dir, config_file):
     assert result.exit_code == 0, result.output
     assert helpers.remove_trailing_spaces(result.output) == helpers.dedent(
         """
-            Project
+        Project
         +-------------+
         | Name        |
         +=============+
@@ -103,7 +103,7 @@ def test_environment_only(hatch, helpers, temp_dir, config_file):
     assert result.exit_code == 0, result.output
     assert helpers.remove_trailing_spaces(result.output) == helpers.dedent(
         """
-         Env: default
+        Env: default
         +-------------+
         | Name        |
         +=============+
@@ -140,13 +140,13 @@ def test_default_both(hatch, helpers, temp_dir, config_file):
     assert result.exit_code == 0, result.output
     assert helpers.remove_trailing_spaces(result.output) == helpers.dedent(
         """
-            Project
+        Project
         +-------------+
         | Name        |
         +=============+
         | foo-bar-baz |
         +-------------+
-         Env: default
+        Env: default
         +-------------+
         | Name        |
         +=============+
@@ -196,15 +196,15 @@ def test_optional_columns(hatch, helpers, temp_dir, config_file):
     assert result.exit_code == 0, result.output
     assert helpers.remove_trailing_spaces(result.output) == helpers.dedent(
         """
-                                      Project
+        Project
         +-----------------+----------+------------------------+------------+
         | Name            | Versions | Markers                | Features   |
         +=================+==========+========================+============+
         | bar-baz         | >=1.2rc5 |                        | eddsa, tls |
         | foo             |          | python_version < '3.8' |            |
         | python-dateutil |          |                        |            |
         +-----------------+----------+------------------------+------------+
-                                                    Env: default
+        Env: default
         +---------+----------------------------------------+----------+------------------------+------------+
         | Name    | URL                                    | Versions | Markers                | Features   |
         +=========+========================================+==========+========================+============+
@@ -252,7 +252,7 @@ def test_plugin_dependencies_unmet(hatch, helpers, temp_dir, config_file, mock_p
     assert helpers.remove_trailing_spaces(result.output) == helpers.dedent(
         """
         Syncing environment plugin requirements
-            Project
+        Project
         +-------------+
         | Name        |
         +=============+