Bump pip and wheel (#2614)

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

.pre-commit-config.yaml

@@ -17,14 +17,14 @@ repos:
     rev: "0.13.0"
     hooks:
       - id: pyproject-fmt
-        additional_dependencies: ["tox>=4.6"]
+        additional_dependencies: ["tox>=4.6.4"]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: "v3.0.0"
     hooks:
       - id: prettier
         args: ["--print-width=120", "--prose-wrap=always"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.0.278"
+    rev: "v0.0.280"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

docs/changelog/2614.bugfix.rst

@@ -0,0 +1,4 @@
+Upgrade embedded wheels:
+
+* pip to ``23.2.1`` from ``23.2``
+* wheel to ``0.41.0`` from ``0.40.0``

pyproject.toml

@@ -41,10 +41,10 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "distlib<1,>=0.3.6",
-  "filelock<4,>=3.12",
+  "distlib<1,>=0.3.7",
+  "filelock<4,>=3.12.2",
   'importlib-metadata>=6.6; python_version < "3.8"',
-  "platformdirs<4,>=3.5.1",
+  "platformdirs<4,>=3.9.1",
 ]
 optional-dependencies.docs = [
   "furo>=2023.5.20",
@@ -60,14 +60,14 @@ optional-dependencies.test = [
   "coverage-enable-subprocess>=1",
   "flaky>=3.7",
   "packaging>=23.1",
-  "pytest>=7.3.1",
-  "pytest-env>=0.8.1",
-  'pytest-freezer>=0.4.6; platform_python_implementation == "PyPy"',
-  "pytest-mock>=3.10",
+  "pytest>=7.4",
+  "pytest-env>=0.8.2",
+  'pytest-freezer>=0.4.8; platform_python_implementation == "PyPy"',
+  "pytest-mock>=3.11.1",
   "pytest-randomly>=3.12",
   "pytest-timeout>=2.1",
-  "setuptools>=67.8",
-  'time-machine>=2.9; platform_python_implementation == "CPython"',
+  "setuptools>=68",
+  'time-machine>=2.10; platform_python_implementation == "CPython"',
 ]
 urls.Documentation = "https://virtualenv.pypa.io"
 urls.Homepage = "https://github.com/pypa/virtualenv"

src/virtualenv/discovery/py_info.py

@@ -278,10 +278,7 @@ def __str__(self) -> str:
                     ),
                     (
                         "original"
-                        if (
-                            self.original_executable != self.system_executable
-                            and self.original_executable != self.executable
-                        )
+                        if self.original_executable not in {self.system_executable, self.executable}
                         else None,
                         self.original_executable,
                     ),

src/virtualenv/discovery/py_spec.py

@@ -58,7 +58,7 @@ def _int_or_none(val):
                     pass
                 else:
                     impl = groups["impl"]
-                    if impl == "py" or impl == "python":
+                    if impl in {"py", "python"}:
                         impl = None
                     arch = _int_or_none(groups["arch"])
 

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

@@ -7,34 +7,34 @@
 BUNDLE_FOLDER = Path(__file__).absolute().parent
 BUNDLE_SUPPORT = {
     "3.7": {
-        "pip": "pip-23.2-py3-none-any.whl",
+        "pip": "pip-23.2.1-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
-        "wheel": "wheel-0.40.0-py3-none-any.whl",
+        "wheel": "wheel-0.41.0-py3-none-any.whl",
     },
     "3.8": {
-        "pip": "pip-23.2-py3-none-any.whl",
+        "pip": "pip-23.2.1-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
-        "wheel": "wheel-0.40.0-py3-none-any.whl",
+        "wheel": "wheel-0.41.0-py3-none-any.whl",
     },
     "3.9": {
-        "pip": "pip-23.2-py3-none-any.whl",
+        "pip": "pip-23.2.1-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
-        "wheel": "wheel-0.40.0-py3-none-any.whl",
+        "wheel": "wheel-0.41.0-py3-none-any.whl",
     },
     "3.10": {
-        "pip": "pip-23.2-py3-none-any.whl",
+        "pip": "pip-23.2.1-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
-        "wheel": "wheel-0.40.0-py3-none-any.whl",
+        "wheel": "wheel-0.41.0-py3-none-any.whl",
     },
     "3.11": {
-        "pip": "pip-23.2-py3-none-any.whl",
+        "pip": "pip-23.2.1-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
-        "wheel": "wheel-0.40.0-py3-none-any.whl",
+        "wheel": "wheel-0.41.0-py3-none-any.whl",
     },
     "3.12": {
-        "pip": "pip-23.2-py3-none-any.whl",
+        "pip": "pip-23.2.1-py3-none-any.whl",
         "setuptools": "setuptools-68.0.0-py3-none-any.whl",
-        "wheel": "wheel-0.40.0-py3-none-any.whl",
+        "wheel": "wheel-0.41.0-py3-none-any.whl",
     },
 }
 MAX = "3.7"

tasks/make_zipapp.py

@@ -231,7 +231,7 @@ def _build_sdist(self, folder, target):
         if not folder.exists() or not list(folder.iterdir()):
             cmd = [*self.pip_cmd, "wheel", "-w", str(folder), "--no-deps", str(target), "-q"]
             run_suppress_output(cmd, stop_print_on_fail=True)
-        return list(folder.iterdir())[0]
+        return next(iter(folder.iterdir()))
 
 
 def run_suppress_output(cmd, stop_print_on_fail=False):  # noqa: FBT002

tox.ini

@@ -42,7 +42,7 @@ commands =
 description = format the code base to adhere to our styles, and complain about what we cannot do automatically
 skip_install = true
 deps =
-    pre-commit>=3.3.2
+    pre-commit>=3.3.3
 commands =
     pre-commit run --all-files --show-diff-on-failure
 
@@ -69,7 +69,7 @@ commands =
 description = upgrade pip/wheels/setuptools to latest
 skip_install = true
 deps =
-    black>=23.3
+    black>=23.7
 pass_env =
     UPGRADE_ADVISORY
 change_dir = {toxinidir}/tasks
@@ -79,7 +79,7 @@ commands =
 [testenv:release]
 description = do a release, required posarg of the version number
 deps =
-    gitpython>=3.1.31
+    gitpython>=3.1.32
     packaging>=23.1
     towncrier>=23.6
 change_dir = {toxinidir}/tasks