Merge branch 'main' into fix/windows-utf8

pypa · Feb 23, 2024 · b673a03 · b673a03
2 parents abb4f71 + 4ca8a20
commit b673a03
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 21 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,24 @@ Release History
 
 .. towncrier release notes start
 
+v20.25.1 (2024-02-21)
+---------------------
+
+Bugfixes - 20.25.1
+~~~~~~~~~~~~~~~~~~
+- Upgrade embedded wheels:
+
+  * setuptools to ``69.0.3`` from ``69.0.2``
+  * pip to ``23.3.2`` from ``23.3.1`` (:issue:`2681`)
+- Upgrade embedded wheels:
+
+  - pip ``23.3.2`` to `24.0``,
+  - setuptools ``69.0.3`` to ``69.1.0``. (:issue:`2691`)
+
+Misc - 20.25.1
+~~~~~~~~~~~~~~
+- :issue:`2688`
+
 v20.25.0 (2023-12-01)
 ---------------------
 

diff --git a/docs/changelog/2681.bugfix.rst b/docs/changelog/2681.bugfix.rst
diff --git a/src/virtualenv/create/pyenv_cfg.py b/src/virtualenv/create/pyenv_cfg.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import os
 from collections import OrderedDict
 
 
@@ -32,7 +33,8 @@ def write(self):
         logging.debug("write %s", self.path)
         text = ""
         for key, value in self.content.items():
-            line = f"{key} = {value}"
+            normalized_value = os.path.realpath(value) if value and os.path.exists(value) else value
+            line = f"{key} = {normalized_value}"
             logging.debug("\t%s", line)
             text += line
             text += "\n"

diff --git a/src/virtualenv/create/via_global_ref/_virtualenv.py b/src/virtualenv/create/via_global_ref/_virtualenv.py
@@ -4,7 +4,6 @@
 
 import os
 import sys
-from contextlib import suppress
 
 VIRTUALENV_PATCH_FILE = os.path.join(__file__)
 
@@ -78,8 +77,10 @@ def find_spec(self, fullname, path, target=None):  # noqa: ARG002
                         old = getattr(spec.loader, func_name)
                         func = self.exec_module if is_new_api else self.load_module
                         if old is not func:
-                            with suppress(AttributeError):  # C-Extension loaders are r/o such as zipimporter with <3.7
+                            try:  # noqa: SIM105
                                 setattr(spec.loader, func_name, partial(func, old))
+                            except AttributeError:
+                                pass  # C-Extension loaders are r/o such as zipimporter with <3.7
                         return spec
                 finally:
                     self.fullname = None

diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
@@ -7,38 +7,38 @@
 BUNDLE_FOLDER = Path(__file__).absolute().parent
 BUNDLE_SUPPORT = {
     "3.7": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.8": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
-        "setuptools": "setuptools-69.0.3-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
+        "setuptools": "setuptools-69.1.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.9": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
-        "setuptools": "setuptools-69.0.3-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
+        "setuptools": "setuptools-69.1.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.10": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
-        "setuptools": "setuptools-69.0.3-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
+        "setuptools": "setuptools-69.1.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.11": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
-        "setuptools": "setuptools-69.0.3-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
+        "setuptools": "setuptools-69.1.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.12": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
-        "setuptools": "setuptools-69.0.3-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
+        "setuptools": "setuptools-69.1.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.13": {
-        "pip": "pip-23.3.2-py3-none-any.whl",
-        "setuptools": "setuptools-69.0.3-py3-none-any.whl",
+        "pip": "pip-24.0-py3-none-any.whl",
+        "setuptools": "setuptools-69.1.0-py3-none-any.whl",
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
 }

diff --git a/.../wheels/embed/pip-23.3.2-py3-none-any.whl → ...ed/wheels/embed/pip-24.0-py3-none-any.whl b/.../wheels/embed/pip-23.3.2-py3-none-any.whl → ...ed/wheels/embed/pip-24.0-py3-none-any.whl
diff --git a/.../embed/setuptools-69.0.3-py3-none-any.whl → .../embed/setuptools-69.1.0-py3-none-any.whl b/.../embed/setuptools-69.0.3-py3-none-any.whl → .../embed/setuptools-69.1.0-py3-none-any.whl
diff --git a/tasks/upgrade_wheels.py b/tasks/upgrade_wheels.py
@@ -120,7 +120,7 @@ def get_embed_wheel(distribution, for_py_version):
         dest_target = DEST / "__init__.py"
         dest_target.write_text(msg, encoding="utf-8")
 
-        subprocess.run([sys.executable, "-m", "ruff", str(dest_target)], check=False)  # noqa: S603
+        subprocess.run([sys.executable, "-m", "ruff", str(dest_target), "--fix", "--unsafe-fixes"], check=False)  # noqa: S603
 
         raise SystemExit(outcome)