Use latest os

Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>

.github/workflows/check.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         py:
-          - "3.12.0-alpha.7"
+          - "3.12.0-beta.2"
           - "3.11"
           - "3.10"
           - "3.9"
@@ -29,12 +29,12 @@ jobs:
           - pypy-3.8
           - pypy-3.7
         os:
-          - ubuntu-22.04
-          - macos-12
-          - windows-2022
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
         include:
-          - { os: macos-12, py: "brew@3.9" }
-          - { os: macos-12, py: "brew@3.8" }
+          - { os: macos-latest, py: "brew@3.9" }
+          - { os: macos-latest, py: "brew@3.8" }
     steps:
       - uses: taiki-e/install-action@cargo-binstall
       - name: Install OS dependencies
@@ -100,17 +100,17 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-22.04
-          - windows-2022
+          - ubuntu-latest
+          - windows-latest
         tox_env:
           - dev
           - docs
           - readme
           - upgrade
           - zipapp
         exclude:
-          - { os: windows-2022, tox_env: readme }
-          - { os: windows-2022, tox_env: docs }
+          - { os: windows-latest, tox_env: readme }
+          - { os: windows-latest, tox_env: docs }
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     environment:
       name: release
       url: https://pypi.org/p/virtualenv

.pre-commit-config.yaml

@@ -4,11 +4,6 @@ repos:
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.0.272"
-    hooks:
-      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/psf/black
     rev: 23.3.0
     hooks:
@@ -28,6 +23,11 @@ repos:
     hooks:
       - id: prettier
         args: ["--print-width=120", "--prose-wrap=always"]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.0.272"
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
   - repo: meta
     hooks:
       - id: check-hooks-apply

docs/changelog/2588.bugfix.rst

@@ -0,0 +1,3 @@
+Upgrade embedded wheels:
+
+* setuptools to ``67.8.0`` from ``67.7.2``

pyproject.toml

@@ -144,7 +144,7 @@ ignore = [
     "ANN",  # no type checking added yet
     "D10",  # no docstrings
     "D40",  # no imperative mode for docstrings
-    "PTH",
+    "PTH",  # no pathlib, <=39 has problems on Windows with absolute/resolve, can revisit once we no longer need 39
     "INP001",  # ignore implicit namespace packages
     "D203",  # `one-blank-line-before-class` (D203) and `no-blank-line-before-class` (D211) are incompatible
     "D212",  # `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible

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

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from pathlib import Path
 
 from virtualenv.seed.wheels.util import Wheel
@@ -8,32 +6,32 @@
 BUNDLE_SUPPORT = {
     "3.7": {
         "pip": "pip-23.1.2-py3-none-any.whl",
-        "setuptools": "setuptools-67.7.2-py3-none-any.whl",
+        "setuptools": "setuptools-67.8.0-py3-none-any.whl",
         "wheel": "wheel-0.40.0-py3-none-any.whl",
     },
     "3.8": {
         "pip": "pip-23.1.2-py3-none-any.whl",
-        "setuptools": "setuptools-67.7.2-py3-none-any.whl",
+        "setuptools": "setuptools-67.8.0-py3-none-any.whl",
         "wheel": "wheel-0.40.0-py3-none-any.whl",
     },
     "3.9": {
         "pip": "pip-23.1.2-py3-none-any.whl",
-        "setuptools": "setuptools-67.7.2-py3-none-any.whl",
+        "setuptools": "setuptools-67.8.0-py3-none-any.whl",
         "wheel": "wheel-0.40.0-py3-none-any.whl",
     },
     "3.10": {
         "pip": "pip-23.1.2-py3-none-any.whl",
-        "setuptools": "setuptools-67.7.2-py3-none-any.whl",
+        "setuptools": "setuptools-67.8.0-py3-none-any.whl",
         "wheel": "wheel-0.40.0-py3-none-any.whl",
     },
     "3.11": {
         "pip": "pip-23.1.2-py3-none-any.whl",
-        "setuptools": "setuptools-67.7.2-py3-none-any.whl",
+        "setuptools": "setuptools-67.8.0-py3-none-any.whl",
         "wheel": "wheel-0.40.0-py3-none-any.whl",
     },
     "3.12": {
         "pip": "pip-23.1.2-py3-none-any.whl",
-        "setuptools": "setuptools-67.7.2-py3-none-any.whl",
+        "setuptools": "setuptools-67.8.0-py3-none-any.whl",
         "wheel": "wheel-0.40.0-py3-none-any.whl",
     },
 }

tests/integration/test_run_int.py

@@ -14,7 +14,7 @@
 
 @pytest.mark.skipif(IS_PYPY, reason="setuptools distutils patching does not work")
 def test_app_data_pinning(tmp_path: Path) -> None:
-    version = "23.0"
+    version = "23.1"
     result = cli_run([str(tmp_path), "--pip", version, "--activators", "", "--seeder", "app-data"])
     code, out, _ = run_cmd([str(result.creator.script("pip")), "list", "--disable-pip-version-check"])
     assert not code