Merge pull request #2880 from gaborbernat/main

Author: gaborbernat

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.11.7"
+    rev: "v0.11.8"
     hooks:
       - id: ruff-format
       - id: ruff

docs/changelog/u.bugfix.rst

@@ -0,0 +1,4 @@
+Upgrade embedded wheels:
+
+* pip to ``25.1.1`` from ``25.1``
+* setuptools to ``80.3.1`` from ``78.1.0``

src/virtualenv/seed/wheels/embed/__init__.py

@@ -12,38 +12,39 @@
         "wheel": "wheel-0.45.1-py3-none-any.whl",
     },
     "3.9": {
-        "pip": "pip-25.1-py3-none-any.whl",
-        "setuptools": "setuptools-78.1.0-py3-none-any.whl",
+        "pip": "pip-25.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-80.3.1-py3-none-any.whl",
     },
     "3.10": {
-        "pip": "pip-25.1-py3-none-any.whl",
-        "setuptools": "setuptools-78.1.0-py3-none-any.whl",
+        "pip": "pip-25.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-80.3.1-py3-none-any.whl",
     },
     "3.11": {
-        "pip": "pip-25.1-py3-none-any.whl",
-        "setuptools": "setuptools-78.1.0-py3-none-any.whl",
+        "pip": "pip-25.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-80.3.1-py3-none-any.whl",
     },
     "3.12": {
-        "pip": "pip-25.1-py3-none-any.whl",
-        "setuptools": "setuptools-78.1.0-py3-none-any.whl",
+        "pip": "pip-25.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-80.3.1-py3-none-any.whl",
     },
     "3.13": {
-        "pip": "pip-25.1-py3-none-any.whl",
-        "setuptools": "setuptools-78.1.0-py3-none-any.whl",
+        "pip": "pip-25.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-80.3.1-py3-none-any.whl",
     },
     "3.14": {
-        "pip": "pip-25.1-py3-none-any.whl",
-        "setuptools": "setuptools-78.1.0-py3-none-any.whl",
+        "pip": "pip-25.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-80.3.1-py3-none-any.whl",
     },
 }
 MAX = "3.8"
 
 
 def get_embed_wheel(distribution, for_py_version):
-    wheelfile = (BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]).get(distribution)
-    if wheelfile is None:
+    mapping = BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]
+    wheel_file = mapping.get(distribution)
+    if wheel_file is None:
         return None
-    path = BUNDLE_FOLDER / wheelfile
+    path = BUNDLE_FOLDER / wheel_file
     return Wheel.from_path(path)
 
 

src/virtualenv/seed/wheels/embed/pip-25.1-py3-none-any.whl renamed to src/virtualenv/seed/wheels/embed/pip-25.1.1-py3-none-any.whl

@@ -38,7 +38,7 @@ def download(ver, dest, package):
     )
 
 
-def run():  # noqa: C901
+def run():  # noqa: C901, PLR0912
     old_batch = {i.name for i in DEST.iterdir() if i.suffix == ".whl"}
     with TemporaryDirectory() as temp:
         temp_path = Path(temp)
@@ -50,6 +50,8 @@ def run():  # noqa: C901
             into.mkdir()
             folders[into] = support_ver
             for package in BUNDLED:
+                if package == "wheel" and support >= (3, 9):
+                    continue
                 thread = Thread(target=download, args=(support_ver, str(into), package))
                 targets.append(thread)
                 thread.start()
@@ -90,8 +92,10 @@ def run():  # noqa: C901
                 if (folder / package).exists():
                     support_table[version].append(package)
         support_table = {k: OrderedDict((i.split("-")[0], i) for i in v) for k, v in support_table.items()}
-        bundle = ",".join(
-            f"{v!r}: {{ {','.join(f'{p!r}: {f!r}' for p, f in line.items())} }}" for v, line in support_table.items()
+        nl = "\n"
+        bundle = "".join(
+            f"\n        {v!r}: {{{nl}{''.join(f'            {p!r}: {f!r},{nl}' for p, f in line.items())}        }},"
+            for v, line in support_table.items()
         )
         msg = dedent(
             f"""