[pre-commit.ci] pre-commit autoupdate (#1563)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Bernát Gábor <bgabor8@bloomberg.net>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -7,11 +7,11 @@ repos:
   - id: trailing-whitespace
   - id: check-yaml
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: v2.7.0
+  rev: v2.19.0
   hooks:
     - id: pyproject-fmt
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.8
+  rev: v0.15.6
   hooks:
   - id: ruff
     args: [ "--fix", "--unsafe-fixes", "--show-fixes", "--exit-non-zero-on-fix"]

pyproject.toml

@@ -31,6 +31,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 dynamic = [
   "version",
@@ -43,11 +44,11 @@ dependencies = [
   "tomli; python_version<'3.11'",
   "userpath>=1.6,!=1.9",
 ]
-urls.Documentation = "https://pipx.pypa.io"
-urls.Homepage = "https://pipx.pypa.io"
 urls."Issue Tracker" = "https://github.com/pypa/pipx/issues"
 urls."Release Notes" = "https://pipx.pypa.io/latest/changelog/"
 urls."Source Code" = "https://github.com/pypa/pipx"
+urls.Documentation = "https://pipx.pypa.io"
+urls.Homepage = "https://pipx.pypa.io"
 scripts.pipx = "pipx.main:cli"
 
 [tool.hatch]
@@ -99,19 +100,24 @@ lint.mccabe.max-complexity = 15
 
 [tool.codespell]
 # Ref: https://github.com/codespell-project/codespell#using-a-config-file
-skip = '.git,*.pdf,*.svg,.nox,testdata,.mypy_cache'
+skip = ".git,*.pdf,*.svg,.nox,testdata,.mypy_cache"
 check-hidden = true
 # case sensitive etc
-ignore-regex = '\b(UE|path/doesnt/exist)\b'
+ignore-regex = "\\b(UE|path/doesnt/exist)\\b"
 
-[tool.pytest.ini_options]
-minversion = "8"
-log_cli_level = "INFO"
-markers = [
+[tool.mypy]
+overrides = [ { module = [
+  "pycowsay.*",
+], ignore_missing_imports = true } ]
+
+[tool.pytest]
+ini_options.minversion = "8"
+ini_options.log_cli_level = "INFO"
+ini_options.markers = [
   "all_packages: test install with maximum number of packages",
 ]
-testpaths = [ "tests" ]
-addopts = [ "-ra", "--strict-config", "--strict-markers" ]
+ini_options.testpaths = [ "tests" ]
+ini_options.addopts = [ "-ra", "--strict-config", "--strict-markers" ]
 
 [tool.towncrier]
 directory = "changelog.d"
@@ -125,9 +131,3 @@ underlines = [
 title_format = "## [{version}](https://github.com/pypa/pipx/tree/{version}) - {project_date}"
 issue_format = "[#{issue}](https://github.com/pypa/pipx/issues/{issue})"
 package = "pipx"
-
-[[tool.mypy.overrides]]
-module = [
-  "pycowsay.*",
-]
-ignore_missing_imports = true

src/pipx/commands/upgrade.py

@@ -274,7 +274,7 @@ def upgrade_shared(
     pip_args: List[str],
 ) -> ExitCode:
     """Return pipx exit code."""
-    from pipx.shared_libs import shared_libs
+    from pipx.shared_libs import shared_libs  # noqa: PLC0415
 
     shared_libs.upgrade(verbose=verbose, pip_args=pip_args, raises=True)
 

src/pipx/interpreter.py

@@ -17,7 +17,7 @@
 
 def has_venv() -> bool:
     try:
-        import venv  # noqa: F401
+        import venv  # noqa: F401, PLC0415
     except ImportError:
         return False
     return True

src/pipx/shared_libs.py

@@ -1,9 +1,13 @@
 import datetime
 import logging
 import time
+from contextlib import suppress
 from pathlib import Path
 from typing import Dict, List
 
+from packaging.requirements import InvalidRequirement, Requirement
+from packaging.specifiers import SpecifierSet
+
 from pipx import paths
 from pipx.animate import animate
 from pipx.constants import WINDOWS
@@ -122,6 +126,17 @@ def upgrade(self, *, pip_args: List[str], verbose: bool = False, raises: bool =
         _pip_args = [arg for arg in pip_args if arg not in ignored_args]
         if not verbose:
             _pip_args.append("-q")
+
+        user_pip_req = None
+        for arg in _pip_args:
+            with suppress(InvalidRequirement):
+                if (req := Requirement(arg)).name == "pip":
+                    user_pip_req = req
+                    break
+
+        add_default = not user_pip_req or not (user_pip_req.specifier & SpecifierSet(">=23.1"))
+        install_args = [*_pip_args, "pip >= 23.1"] if add_default else _pip_args
+
         try:
             with animate("upgrading shared libraries", not verbose):
                 upgrade_process = run_subprocess(
@@ -132,9 +147,8 @@ def upgrade(self, *, pip_args: List[str], verbose: bool = False, raises: bool =
                         "--no-input",
                         "--disable-pip-version-check",
                         "install",
-                        *_pip_args,
                         "--upgrade",
-                        "pip >= 23.1",
+                        *install_args,
                     ]
                 )
             subprocess_post_check(upgrade_process)

testdata/empty_project/pyproject.toml

@@ -1,6 +1,5 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-
 requires = [
   "setuptools",
 ]
@@ -20,6 +19,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 scripts.empty-project = "empty_project.main:cli"
 entry-points."pipx.run".empty-project = "empty_project.main:cli"

tests/test_package_specifier.py

@@ -272,6 +272,6 @@ def test_parse_specifier_for_install(
     root,
 ):
     monkeypatch.chdir(root)
-    [package_or_url_out, pip_args_out] = parse_specifier_for_install(package_spec_in, pip_args_in)
+    parse_specifier_for_install(package_spec_in, pip_args_in)
     if warning_str is not None:
         assert warning_str in caplog.text

tests/test_upgrade_shared.py

@@ -8,7 +8,7 @@
 @pytest.fixture
 def shared_libs(pipx_ultra_temp_env):
     # local import to get the shared_libs object patched by fixtures
-    from pipx.shared_libs import shared_libs as _shared_libs
+    from pipx.shared_libs import shared_libs as _shared_libs  # noqa: PLC0415
 
     yield _shared_libs