Bump embeded wheels (#2741)

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

.github/workflows/check.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         py:
-          - "3.13.0-alpha.6"
+          - "3.13.0-beta.2"
           - "3.12"
           - "3.11"
           - "3.10"
@@ -46,6 +46,9 @@ jobs:
           - { os: ubuntu-latest, py: "pypy-3.7" }
           - { os: windows-latest, py: "pypy-3.7" }
           - { os: macos-12, py: "pypy-3.7" }
+        exclude:
+          - { os: windows-latest, py: "pypy-3.10" }
+          - { os: windows-latest, py: "pypy-3.9" }
     steps:
       - uses: taiki-e/install-action@cargo-binstall
       - name: Install OS dependencies

.pre-commit-config.yaml

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

docs/changelog/2741.bugfix.rst

@@ -0,0 +1,4 @@
+Upgrade embedded wheels:
+
+* setuptools to ``70.1.0`` from ``69.5.1``
+* pip to ``24.1``from ``24.0``

pyproject.toml

@@ -64,7 +64,7 @@ optional-dependencies.test = [
   "packaging>=23.1",
   "pytest>=7.4",
   "pytest-env>=0.8.2",
-  "pytest-freezer>=0.4.8; platform_python_implementation=='PyPy'",
+  "pytest-freezer>=0.4.8; platform_python_implementation=='PyPy' or (platform_python_implementation=='CPython' and sys_platform=='win32' and python_version>='3.13')",
   "pytest-mock>=3.11.1",
   "pytest-randomly>=3.12",
   "pytest-timeout>=2.1",

src/virtualenv/discovery/builtin.py

@@ -164,11 +164,10 @@ def get_paths(env: Mapping[str, str]) -> Generator[Path, None, None]:
             path = os.confstr("CS_PATH")
         except (AttributeError, ValueError):
             path = os.defpath
-    if not path:
-        return None
-    for p in map(Path, path.split(os.pathsep)):
-        if p.exists():
-            yield p
+    if path:
+        for p in map(Path, path.split(os.pathsep)):
+            if p.exists():
+                yield p
 
 
 class LazyPathDump:

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

@@ -12,33 +12,38 @@
         "wheel": "wheel-0.42.0-py3-none-any.whl",
     },
     "3.8": {
-        "pip": "pip-24.0-py3-none-any.whl",
-        "setuptools": "setuptools-69.5.1-py3-none-any.whl",
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
         "wheel": "wheel-0.43.0-py3-none-any.whl",
     },
     "3.9": {
-        "pip": "pip-24.0-py3-none-any.whl",
-        "setuptools": "setuptools-69.5.1-py3-none-any.whl",
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
         "wheel": "wheel-0.43.0-py3-none-any.whl",
     },
     "3.10": {
-        "pip": "pip-24.0-py3-none-any.whl",
-        "setuptools": "setuptools-69.5.1-py3-none-any.whl",
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
         "wheel": "wheel-0.43.0-py3-none-any.whl",
     },
     "3.11": {
-        "pip": "pip-24.0-py3-none-any.whl",
-        "setuptools": "setuptools-69.5.1-py3-none-any.whl",
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
         "wheel": "wheel-0.43.0-py3-none-any.whl",
     },
     "3.12": {
-        "pip": "pip-24.0-py3-none-any.whl",
-        "setuptools": "setuptools-69.5.1-py3-none-any.whl",
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
         "wheel": "wheel-0.43.0-py3-none-any.whl",
     },
     "3.13": {
-        "pip": "pip-24.0-py3-none-any.whl",
-        "setuptools": "setuptools-69.5.1-py3-none-any.whl",
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
+        "wheel": "wheel-0.43.0-py3-none-any.whl",
+    },
+    "3.14": {
+        "pip": "pip-24.1-py3-none-any.whl",
+        "setuptools": "setuptools-70.1.0-py3-none-any.whl",
         "wheel": "wheel-0.43.0-py3-none-any.whl",
     },
 }

src/virtualenv/seed/wheels/embed/pip-24.1-py3-none-any.whl

@@ -15,7 +15,7 @@
 STRICT = "UPGRADE_ADVISORY" not in os.environ
 
 BUNDLED = ["pip", "setuptools", "wheel"]
-SUPPORT = [(3, i) for i in range(7, 14)]
+SUPPORT = [(3, i) for i in range(7, 15)]
 DEST = Path(__file__).resolve().parents[1] / "src" / "virtualenv" / "seed" / "wheels" / "embed"
 
 

src/virtualenv/seed/wheels/embed/setuptools-69.5.1-py3-none-any.whl renamed to src/virtualenv/seed/wheels/embed/setuptools-70.1.0-py3-none-any.whl

@@ -351,7 +351,7 @@ def _skip_if_test_in_system(session_app_data):
         pytest.skip("test not valid if run under system")
 
 
-if IS_PYPY:
+if IS_PYPY or (IS_WIN and sys.version_info[0:2] >= (3, 13)):  # https://github.com/adamchainz/time-machine/issues/456
 
     @pytest.fixture()
     def time_freeze(freezer):