Merge branch 'main' into fix/powershell-arg-completion

meet-vasita · web-flow · commit 823f88e2d0c3 · 2025-09-12T22:26:36.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
       - run: pip install nox
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
       - name: Set up git credentials
@@ -95,7 +95,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -126,7 +126,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
@@ -196,7 +196,7 @@ jobs:
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
 
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
@@ -231,7 +231,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,4 +41,4 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # release/v1
diff --git a/.github/workflows/update-rtd-redirects.yml b/.github/workflows/update-rtd-redirects.yml
@@ -22,7 +22,7 @@ jobs:
     environment: RTD Deploys
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.11"
       - run: pipx run tools/update-rtd-redirects.py
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.7
+  rev: v0.12.11
   hooks:
     - id: ruff-check
       args: [--fix]
diff --git a/news/13443.bugfix.rst b/news/13443.bugfix.rst
@@ -0,0 +1,2 @@
+Handle malformed ``Version`` metadata entries and
+show a sensible error message instead of crashing.
diff --git a/news/13523.bugfix.rst b/news/13523.bugfix.rst
@@ -0,0 +1 @@
+Permit spaces between a filepath and extras in an install requirement.
diff --git a/news/13548.bugfix.rst b/news/13548.bugfix.rst
@@ -0,0 +1,2 @@
+Fix regression in configuration parsing that was turning a single value
+into a list and thus leading to a validation error.
diff --git a/src/pip/_internal/cli/parser.py b/src/pip/_internal/cli/parser.py
@@ -203,9 +203,9 @@ def _get_ordered_configuration_items(
                 if section in override_order:
                     section_items[section].append((key, val))
 
-            # Yield each group in their override order
-            for section in override_order:
-                yield from section_items[section]
+        # Yield each group in their override order
+        for section in override_order:
+            yield from section_items[section]
 
     def _update_defaults(self, defaults: dict[str, Any]) -> dict[str, Any]:
         """Updates the given defaults with values from the config files and
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
@@ -28,6 +28,7 @@
 from pip._internal.utils.wheel import parse_wheel, read_wheel_metadata_file
 
 from ._compat import (
+    BadMetadata,
     BasePath,
     get_dist_canonical_name,
     parse_name_and_version_from_info_directory,
@@ -165,9 +166,14 @@ def canonical_name(self) -> NormalizedName:
 
     @property
     def version(self) -> Version:
-        if version := parse_name_and_version_from_info_directory(self._dist)[1]:
+        try:
+            version = (
+                parse_name_and_version_from_info_directory(self._dist)[1]
+                or self._dist.version
+            )
             return parse_version(version)
-        return parse_version(self._dist.version)
+        except TypeError:
+            raise BadMetadata(self._dist, reason="invalid metadata entry `version`")
 
     @property
     def raw_version(self) -> str:
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
@@ -47,7 +47,7 @@ def _strip_extras(path: str) -> tuple[str, str | None]:
     m = re.match(r"^(.+)(\[[^\]]+\])$", path)
     extras = None
     if m:
-        path_no_extras = m.group(1)
+        path_no_extras = m.group(1).rstrip()
         extras = m.group(2)
     else:
         path_no_extras = path
diff --git a/tests/functional/test_configuration.py b/tests/functional/test_configuration.py
@@ -9,12 +9,14 @@
 import sys
 import textwrap
 
+import pytest
+
 from pip._internal.cli.status_codes import ERROR
 from pip._internal.configuration import CONFIG_BASENAME, Kind
 from pip._internal.configuration import get_configuration_files as _get_config_files
 from pip._internal.utils.compat import WINDOWS
 
-from tests.lib import PipTestEnvironment
+from tests.lib import PipTestEnvironment, TestData
 from tests.lib.configuration_helpers import ConfigurationMixin, kinds
 from tests.lib.venv import VirtualEnvironment
 
@@ -212,3 +214,21 @@ def test_config_separated(
             ),
             result.stdout,
         )
+
+    @pytest.mark.network
+    def test_editable_mode_default_config(
+        self, script: PipTestEnvironment, data: TestData
+    ) -> None:
+        """Test that setting default editable mode through configuration works
+        as expected.
+        """
+        script.pip(
+            "config", "--site", "set", "install.config-settings", "editable_mode=strict"
+        )
+        to_install = data.src.joinpath("simplewheel-1.0")
+        script.pip("install", "-e", to_install)
+        assert os.path.isdir(
+            os.path.join(
+                to_install, "build", "__editable__.simplewheel-1.0-py3-none-any"
+            )
+        )
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
@@ -768,6 +768,7 @@ def test_requirement_file(self) -> None:
             ("pkg [ext] == 1.0; python_version<='3.6'", "pkg==1.0"),
             ("pkg-all.allowed_chars0 ~= 2.0", "pkg-all.allowed_chars0~=2.0"),
             ("pkg-all.allowed_chars0 [ext] ~= 2.0", "pkg-all.allowed_chars0~=2.0"),
+            ("simple-0.1-py2.py3-none-any.whl [ext]", "simple==0.1"),
         ],
     )
     def test_install_req_drop_extras(self, inp: str, out: str) -> None:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Handle malformed ``Version`` metadata entries and
	`2`	`+show a sensible error message instead of crashing.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Permit spaces between a filepath and extras in an install requirement.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix regression in configuration parsing that was turning a single value`
	`2`	`+into a list and thus leading to a validation error.`