pip 24.3__tar.gz → 25.0__tar.gz

{pip-24.3 → pip-25.0}/AUTHORS.txt

@@ -125,6 +125,7 @@ burrows
 Bussonnier Matthias
 bwoodsend
 c22
+Caleb Brown
 Caleb Martinez
 Calvin Smith
 Carl Meyer
@@ -134,6 +135,7 @@ Carter Thayer
 Cass
 Chandrasekhar Atina
 Charlie Marsh
+charwick
 Chih-Hsuan Yen
 Chris Brinker
 Chris Hunt
@@ -403,18 +405,22 @@ Josh Cannon
 Josh Hansen
 Josh Schneier
 Joshua
+JoshuaPerdue
 Juan Luis Cano Rodríguez
 Juanjo Bazán
 Judah Rand
 Julian Berman
 Julian Gethmann
 Julien Demoor
+July Tikhonov
 Jussi Kukkonen
+Justin van Heek
 jwg4
 Jyrki Pulliainen
 Kai Chen
 Kai Mueller
 Kamal Bin Mustafa
+Karolina Surma
 kasium
 kaustav haldar
 keanemind
@@ -625,6 +631,7 @@ R. David Murray
 Rafael Caricio
 Ralf Schmitt
 Ran Benita
+Randy Döring
 Razzi Abuissa
 rdb
 Reece Dunham

{pip-24.3 → pip-25.0}/MANIFEST.in

@@ -5,23 +5,22 @@ include README.rst
 include SECURITY.md
 include pyproject.toml
 
+include build-requirements.in
+include build-requirements.txt
+include build-project.py
+
 include src/pip/_vendor/README.rst
 include src/pip/_vendor/vendor.txt
-include src/pip/_vendor/pyparsing/diagram/template.jinja2
 recursive-include  src/pip/_vendor *LICENSE*
 recursive-include  src/pip/_vendor *COPYING*
 
-include docs/docutils.conf
 include docs/requirements.txt
 
 exclude .git-blame-ignore-revs
-exclude .coveragerc
 exclude .mailmap
-exclude .appveyor.yml
 exclude .readthedocs.yml
 exclude .pre-commit-config.yaml
 exclude .readthedocs-custom-redirects.yml
-exclude tox.ini
 exclude noxfile.py
 
 recursive-include src/pip/_vendor *.pem
@@ -34,6 +33,5 @@ recursive-exclude src/pip/_vendor *.pyi
 prune .github
 prune docs/build
 prune news
-prune tasks
 prune tests
 prune tools

{pip-24.3 → pip-25.0}/NEWS.rst

@@ -9,7 +9,80 @@
 
 .. towncrier release notes start
 
-24.3 (2024-10-26)
+25.0 (2025-01-26)
+=================
+
+Deprecations and Removals
+-------------------------
+
+- Deprecate the ``no-python-version-warning`` flag as it has long done nothing
+  since Python 2 support was removed in pip 21.0. (`#13154 <https://github.com/pypa/pip/issues/13154>`_)
+
+Features
+--------
+
+- Prefer to display :pep:`639` ``License-Expression`` in ``pip show`` if metadata version is at least 2.4. (`#13112 <https://github.com/pypa/pip/issues/13112>`_)
+- Support :pep:`639` ``License-Expression`` and ``License-File`` metadata fields in JSON
+  output. ``pip inspect`` and ``pip install --report`` now emit
+  ``license_expression`` and ``license_file`` fields in the ``metadata`` object,
+  if the corresponding fields are present in the installed ``METADATA`` file. (`#13134 <https://github.com/pypa/pip/issues/13134>`_)
+- Files in the network cache will inherit the read/write permissions of pip's cache
+  directory (in addition to the current user retaining read/write access). This
+  enables a single cache to be shared among multiple users. (`#11012 <https://github.com/pypa/pip/issues/11012>`_)
+- Return the size, along with the number, of files cleared on ``pip cache purge`` and ``pip cache remove`` (`#12176 <https://github.com/pypa/pip/issues/12176>`_)
+- Cache ``python-requires`` checks while filtering potential installation candidates. (`#13128 <https://github.com/pypa/pip/issues/13128>`_)
+- Optimize package collection by avoiding unnecessary URL parsing and other processing. (`#13132 <https://github.com/pypa/pip/issues/13132>`_)
+
+Bug Fixes
+---------
+
+- Reorder the encoding detection when decoding a requirements file, relying on
+  UTF-8 over the locale encoding by default, matching the documented behaviour.
+  (`#12771 <https://github.com/pypa/pip/issues/12771>`_)
+- The pip version self check is disabled on ``EXTERNALLY-MANAGED`` environments. (`#11820 <https://github.com/pypa/pip/issues/11820>`_)
+- Fix a security bug allowing a specially crafted wheel to execute code during
+  installation. (`#13079 <https://github.com/pypa/pip/issues/13079>`_)
+- The inclusion of ``packaging`` 24.2 changes how pre-release specifiers with ``<`` and ``>``
+  behave. Including a pre-release version with these specifiers now implies
+  accepting pre-releases (e.g., ``<2.0dev`` can include ``1.0rc1``). To avoid
+  implying pre-releases, avoid specifying them (e.g., use ``<2.0``).
+  The exception is ``!=``, which never implies pre-releases. (`#13163 <https://github.com/pypa/pip/issues/13163>`_)
+- The ``--cert`` and ``--client-cert`` command-line options are now respected while
+  installing build dependencies. Consequently, the private ``_PIP_STANDALONE_CERT``
+  environment variable is no longer used. (`#5502 <https://github.com/pypa/pip/issues/5502>`_)
+- The ``--proxy`` command-line option is now respected while installing build dependencies. (`#6018 <https://github.com/pypa/pip/issues/6018>`_)
+
+Vendored Libraries
+------------------
+
+- Upgrade CacheControl to 0.14.1
+- Upgrade idna to 3.10
+- Upgrade msgpack to 1.1.0
+- Upgrade packaging to 24.2
+- Upgrade platformdirs to 4.3.6
+- Upgrade pyproject-hooks to 1.2.0
+- Upgrade rich to 13.9.4
+- Upgrade tomli to 2.2.1
+
+Improved Documentation
+----------------------
+
+- Removed section about non-existing ``--force-keyring`` flag. (`#12455 <https://github.com/pypa/pip/issues/12455>`_)
+
+Process
+-------
+
+- Started releasing to PyPI from a GitHub Actions CI/CD workflow that implements trusted publishing and bundles :pep:`740` digital attestations.
+
+24.3.1 (2024-10-27)
+===================
+
+Bug Fixes
+---------
+
+- Allow multiple nested inclusions of the same requirements file again. (`#13046 <https://github.com/pypa/pip/issues/13046>`_)
+
+24.3 (2024-10-27)
 =================
 
 Deprecations and Removals
@@ -3342,7 +3415,7 @@ Improved Documentation
 - Upgrade the bundled copy of requests to 2.6.0, fixing CVE-2015-2296.
 - Display format of latest package when using ``pip list --outdated``. (#2475)
 - Don't use pywin32 as ctypes should always be available on Windows, using
-  pywin32 prevented uninstallation of pywin32 on Windows. (:pull:`2467`)
+  pywin32 prevented uninstallation of pywin32 on Windows. (:pr:`2467`)
 - Normalize the ``--wheel-dir`` option, expanding out constructs such as ``~``
   when used. (#2441)
 - Display a warning when an undefined extra has been requested. (#2142)
@@ -3633,7 +3706,7 @@ Improved Documentation
   --no-download`` are now formally deprecated.  See #906 for discussion on
   possible alternatives, or lack thereof, in future releases.
 - **DEPRECATION** ``pip zip`` and ``pip unzip`` are now formally deprecated.
-- pip will now install Mac OSX platform wheels from PyPI. (:pull:`1278`)
+- pip will now install Mac OSX platform wheels from PyPI. (:pr:`1278`)
 - pip now generates the appropriate platform-specific console scripts when
   installing wheels. (#1251)
 - pip now confirms a wheel is supported when installing directly from a path or

{pip-24.3 → pip-25.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pip
-Version: 24.3
+Version: 25.0
 Summary: The PyPA recommended tool for installing Python packages.
 Author-email: The pip developers <distutils-sig@python.org>
 License: MIT

pip-25.0/build-project.py

@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+"""Build pip using pinned build requirements."""
+
+import subprocess
+import tempfile
+import venv
+from os import PathLike
+from pathlib import Path
+from types import SimpleNamespace
+
+
+class EnvBuilder(venv.EnvBuilder):
+    """A subclass of venv.EnvBuilder that exposes the python executable command."""
+
+    def ensure_directories(
+        self, env_dir: str | bytes | PathLike[str] | PathLike[bytes]
+    ) -> SimpleNamespace:
+        context = super().ensure_directories(env_dir)
+        self.env_exec_cmd = context.env_exec_cmd
+        return context
+
+
+def get_git_head_timestamp() -> str:
+    return subprocess.run(
+        [
+            "git",
+            "log",
+            "-1",
+            "--pretty=format:%ct",
+        ],
+        text=True,
+        stdout=subprocess.PIPE,
+    ).stdout.strip()
+
+
+def main() -> None:
+    with tempfile.TemporaryDirectory() as build_env:
+        env_builder = EnvBuilder(with_pip=True)
+        env_builder.create(build_env)
+        subprocess.run(
+            [
+                env_builder.env_exec_cmd,
+                "-Im",
+                "pip",
+                "install",
+                "--no-deps",
+                "--only-binary=:all:",
+                "--require-hashes",
+                "-r",
+                Path(__file__).parent / "build-requirements.txt",
+            ],
+            check=True,
+        )
+        subprocess.run(
+            [
+                env_builder.env_exec_cmd,
+                "-Im",
+                "build",
+                "--no-isolation",
+            ],
+            check=True,
+            env={"SOURCE_DATE_EPOCH": get_git_head_timestamp()},
+        )
+
+
+if __name__ == "__main__":
+    main()

pip-25.0/build-requirements.in

@@ -0,0 +1,2 @@
+build
+setuptools

pip-25.0/build-requirements.txt

@@ -0,0 +1,24 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --generate-hashes build-requirements.in
+#
+build==1.2.2.post1 \
+    --hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 \
+    --hash=sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7
+    # via -r build-requirements.in
+packaging==24.2 \
+    --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
+    --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
+    # via build
+pyproject-hooks==1.2.0 \
+    --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
+    --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
+    # via build
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.8.0 \
+    --hash=sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6 \
+    --hash=sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3
+    # via -r build-requirements.in

{pip-24.3 → pip-25.0}/docs/html/conf.py

@@ -17,7 +17,6 @@ extensions = [
     # first-party extensions
     "sphinx.ext.autodoc",
     "sphinx.ext.todo",
-    "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     # our extensions
     "pip_sphinxext",
@@ -26,6 +25,7 @@ extensions = [
     "sphinx_copybutton",
     "sphinx_inline_tabs",
     "sphinxcontrib.towncrier",
+    "sphinx_issues",
 ]
 
 # General information about the project.
@@ -71,14 +71,6 @@ intersphinx_mapping = {
     "pypug": ("https://packaging.python.org", None),
 }
 
-# -- Options for extlinks -------------------------------------------------------------
-
-extlinks = {
-    "issue": ("https://github.com/pypa/pip/issues/%s", "#%s"),
-    "pull": ("https://github.com/pypa/pip/pull/%s", "PR #%s"),
-    "pypi": ("https://pypi.org/project/%s/", "%s"),
-}
-
 # -- Options for towncrier_draft extension --------------------------------------------
 
 towncrier_draft_autoversion_mode = "draft"  # or: 'sphinx-release', 'sphinx-version'
@@ -137,3 +129,7 @@ man_pages = determine_man_pages()
 copybutton_prompt_text = r"\$ | C\:\> "
 copybutton_prompt_is_regexp = True
 copybutton_only_copy_prompt_lines = False
+
+# -- Options for sphinx_issues --------------------------------------------------------
+
+issues_default_group_project = "pypa/pip"

{pip-24.3 → pip-25.0}/docs/html/development/architecture/command-line-interface.rst

@@ -154,7 +154,7 @@ Its main addition consists of the following function:
 
   .. py:method:: get_default_values()
 
-    Overrides the original method to allow updating the defaults ater the instantiation of the
+    Overrides the original method to allow updating the defaults after the instantiation of the
     option parser.
 
 It allows overriding the default options and arguments using the ``Configuration`` class

{pip-24.3 → pip-25.0}/docs/html/development/architecture/overview.rst

@@ -134,7 +134,7 @@ Once it has those, it selects one file and downloads it.
 cannot….should not be …. ? I want only the Flask …. Why am I getting the
 whole list?
 
-Answer: It's not every file, just files of Flask. No API for getting alllllll
+Answer: It's not every file, just files of Flask. No API for getting all
 files on PyPI. It’s for getting all files of Flask.)
 
 .. _`tracking issue`: https://github.com/pypa/pip/issues/6831

{pip-24.3 → pip-25.0}/docs/html/development/release-process.rst

@@ -146,11 +146,8 @@ Creating a new release
    This will update the relevant files and tag the correct commit.
 #. Submit the ``release/YY.N`` branch as a pull request and ensure CI passes.
    Merge the changes back into ``main`` and pull them back locally.
-#. Build the release artifacts using ``nox -s build-release -- YY.N``.
-   This will checkout the tag, generate the distribution files to be
-   uploaded and checkout the main branch again.
-#. Upload the release to PyPI using ``nox -s upload-release -- YY.N``.
-#. Push the tag created by ``prepare-release``.
+#. Push the tag created by ``prepare-release``. This will trigger the release
+   workflow on GitHub and publish to PyPI.
 #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as
    documented there) and commit the results.
 #. Submit a Pull Request to `CPython`_ adding the new version of pip

{pip-24.3 → pip-25.0}/docs/html/reference/requirements-file-format.md

@@ -56,9 +56,9 @@ examples of all these forms, see {ref}`pip install Examples`.
 
 ### Encoding
 
-Requirements files are `utf-8` encoding by default and also support
-{pep}`263` style comments to change the encoding (i.e.
-`# -*- coding: <encoding name> -*-`).
+The default encoding for requirement files is `UTF-8` unless a different
+encoding is specified using a {pep}`263` style comment (e.g. `# -*- coding:
+<encoding name> -*-`).
 
 ### Line continuations
 

{pip-24.3 → pip-25.0}/docs/html/topics/authentication.md

@@ -163,25 +163,6 @@ from the subprocess in which they run Pip. You won't know whether the keyring
 backend is waiting the user input or not in such situations.
 ```
 
-pip is conservative and does not query keyring at all when `--no-input` is used
-because the keyring might require user interaction such as prompting the user
-on the console. You can force keyring usage by passing `--force-keyring` or one
-of the following:
-
-```bash
-# possibly with --user, --global or --site
-$ pip config set global.force-keyring true
-# or
-$ export PIP_FORCE_KEYRING=1
-```
-
-```{warning}
-Be careful when doing this since it could cause tools such as pipx and Pipenv
-to appear to hang. They show their own progress indicator while hiding output
-from the subprocess in which they run Pip. You won't know whether the keyring
-backend is waiting the user input or not in such situations.
-```
-
 Note that `keyring` (the Python package) needs to be installed separately from
 pip. This can create a bootstrapping issue if you need the credentials stored in
 the keyring to download and install keyring.

{pip-24.3 → pip-25.0}/docs/html/ux-research-design/research-results/improving-pips-documentation.md

@@ -512,7 +512,7 @@ _Suggested content:_
 _Page purpose:_
 
 - To onboard people who want to contribute to pip's docs
-- To share previous research and recommendataions related to pip's docs
+- To share previous research and recommendations related to pip's docs
 
 _Suggested content:_
 

{pip-24.3 → pip-25.0}/docs/html/ux-research-design/research-results/personas.md

@@ -2,7 +2,7 @@
 
 ## Problem
 
-We want to develop personas for pip's user to facilate faster user-centered decision making for the pip development team.
+We want to develop personas for pip's user to facilitate faster user-centered decision making for the pip development team.
 
 [Skip to recommendations](#recommendations)
 

{pip-24.3 → pip-25.0}/docs/html/ux-research-design/research-results/pip-force-reinstall.md

@@ -66,7 +66,7 @@ Most respondents use `--force-reinstall` "almost never" (65.6%):
 ![screenshot of survey question of how often users use --force-reinstall](https://i.imgur.com/fjLQUPV.png)
 ![bar chart of how often users use --force-reinstall](https://i.imgur.com/Xe1XDkI.png)
 
-Amongst respondents who said they use `--force-resinstall` often or very often:
+Amongst respondents who said they use `--force-reinstall` often or very often:
 
 - 54.54% (6/11) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
 - 45.45% (5/11) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
@@ -76,7 +76,7 @@ Respondents find `--force-reinstall` less useful than useful:
 ![screenshot of survey question of how useful users find --force-reinstall](https://i.imgur.com/6cv4lFn.png)
 ![bar chart of how useful users find --force-reinstall](https://i.imgur.com/gMUBDBo.png)
 
-Amongst respondents who said they find `--force-resinstall` useful or very useful:
+Amongst respondents who said they find `--force-reinstall` useful or very useful:
 
 - 38.46% (20/52) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
 - 50% (26/52) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
@@ -89,7 +89,7 @@ In this case, we recommend showing the following message when a user tries to us
 
 > Error: the pip install --force-reinstall option no longer exists. Use pip uninstall then pip install to replace up-to-date packages, or pip install --upgrade to update your packages to the latest available versions.
 
-Should the pip development team wish to keep `--force-resintall`, we recommend maintaining the current (implicit upgrade) behaviour, as pip's users have not expressed a clear preference for a different behaviour.
+Should the pip development team wish to keep `--force-reinstall`, we recommend maintaining the current (implicit upgrade) behaviour, as pip's users have not expressed a clear preference for a different behaviour.
 
 In this case, we recommend upgrading the [help text](https://pip.pypa.io/en/stable/reference/pip_install/#cmdoption-force-reinstall) to be more explicit:
 

{pip-24.3 → pip-25.0}/docs/html/ux-research-design/research-results/prioritizing-features.md

@@ -109,9 +109,9 @@ Results varied by the amount of Python experience the user had.
 
 ![Screenshot of Install a package from wheels](https://i.imgur.com/9DMBfNL.png)
 
-#### Install apackage from a local directory
+#### Install a package from a local directory
 
-![Screenshot of Install apackage from a local directory](https://i.imgur.com/Jp95rak.png)
+![Screenshot of Install a package from a local directory](https://i.imgur.com/Jp95rak.png)
 
 #### Control where you want your installed package to live on your computer
 

{pip-24.3 → pip-25.0}/docs/html/ux-research-design/research-results/users-and-security.md

@@ -56,6 +56,8 @@ Both of these groups identified their "sphere of influence" and did their best t
 
 ### User thoughts about security
 
+Selected quotes from research participants
+
 #### Responsibility as author
 
 Participants who spent a lot of their time writing Python code - either for community or as part of their job - expressed a responsibility to their users for the code they wrote - people who wrote code which was made public expressed a stronger responsibility.
@@ -76,8 +78,7 @@ Participants also explained they rely on code security scanning and checking sof
 
 #### Reliance on good software development practices
 
-A small number of participants e### Selected quotes from research participants
-xplained they have good software practices in place, which help with writing secure software.
+A small number of participants explained they have good software practices in place, which help with writing secure software.
 
 > "We have a book about ethics of code - we have mandatory certification."
 

{pip-24.3 → pip-25.0}/docs/requirements.txt

@@ -7,6 +7,7 @@ myst_parser
 sphinx-copybutton
 sphinx-inline-tabs
 sphinxcontrib-towncrier >= 0.2.0a0
+sphinx-issues
 
 # `docs.pipext` uses pip's internals to generate documentation. So, we install
 # the current directory to make it work.

{pip-24.3 → pip-25.0}/pyproject.toml

@@ -60,8 +60,6 @@ exclude = ["contrib", "docs", "tests*", "tasks"]
 "pip" = ["py.typed"]
 "pip._vendor" = ["vendor.txt"]
 "pip._vendor.certifi" = ["*.pem"]
-"pip._vendor.requests" = ["*.pem"]
-"pip._vendor.distlib._backport" = ["sysconfig.cfg"]
 "pip._vendor.distlib" = [
     "t32.exe",
     "t64.exe",
@@ -123,6 +121,9 @@ drop = [
   "bin/",
   # interpreter and OS specific msgpack libs
   "msgpack/*.so",
+  # optional accelerator extension libraries
+  "*mypyc*.so",
+  "tomli/*.so",
   # unneeded parts of setuptools
   "easy_install.py",
   "setuptools",
@@ -304,10 +305,7 @@ source0 = [
 ]
 
 [tool.coverage.report]
-exclude_lines = [
-    # We must re-state the default because the `exclude_lines` option overrides
-    # it.
-    "pragma: no cover",
+exclude_also = [
     # This excludes typing-specific code, which will be validated by mypy anyway.
     "if TYPE_CHECKING",
 ]

{pip-24.3 → pip-25.0}/src/pip/__init__.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.3"
+__version__ = "25.0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

{pip-24.3 → pip-25.0}/src/pip/_internal/build_env.py

@@ -246,6 +246,8 @@ class BuildEnvironment:
             # target from config file or env var should be ignored
             "--target",
             "",
+            "--cert",
+            finder.custom_cert or where(),
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
             args.append("-vv")
@@ -270,21 +272,23 @@ class BuildEnvironment:
         for link in finder.find_links:
             args.extend(["--find-links", link])
 
+        if finder.proxy:
+            args.extend(["--proxy", finder.proxy])
         for host in finder.trusted_hosts:
             args.extend(["--trusted-host", host])
+        if finder.client_cert:
+            args.extend(["--client-cert", finder.client_cert])
         if finder.allow_all_prereleases:
             args.append("--pre")
         if finder.prefer_binary:
             args.append("--prefer-binary")
         args.append("--")
         args.extend(requirements)
-        extra_environ = {"_PIP_STANDALONE_CERT": where()}
         with open_spinner(f"Installing {kind}") as spinner:
             call_subprocess(
                 args,
                 command_desc=f"pip subprocess to install {kind}",
                 spinner=spinner,
-                extra_environ=extra_environ,
             )
 
 

{pip-24.3 → pip-25.0}/src/pip/_internal/cli/base_command.py

@@ -29,6 +29,7 @@ from pip._internal.exceptions import (
     NetworkConnectionError,
     PreviousBuildDirError,
 )
+from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filesystem import check_path_owner
 from pip._internal.utils.logging import BrokenStdoutLoggingError, setup_logging
 from pip._internal.utils.misc import get_prog, normalize_path
@@ -228,4 +229,12 @@ class Command(CommandContextMixIn):
                 )
                 options.cache_dir = None
 
+        if options.no_python_version_warning:
+            deprecated(
+                reason="--no-python-version-warning is deprecated.",
+                replacement="to remove the flag as it's a no-op",
+                gone_in="25.1",
+                issue=13154,
+            )
+
         return self._run_wrapper(level_number, options, args)

{pip-24.3 → pip-25.0}/src/pip/_internal/cli/cmdoptions.py

@@ -260,8 +260,8 @@ keyring_provider: Callable[..., Option] = partial(
     default="auto",
     help=(
         "Enable the credential lookup via the keyring library if user input is allowed."
-        " Specify which mechanism to use [disabled, import, subprocess]."
-        " (default: disabled)"
+        " Specify which mechanism to use [auto, disabled, import, subprocess]."
+        " (default: %default)"
     ),
 )
 

{pip-24.3 → pip-25.0}/src/pip/_internal/cli/index_command.py

@@ -123,6 +123,7 @@ class SessionCommandMixin(CommandContextMixIn):
                 "https": options.proxy,
             }
             session.trust_env = False
+            session.pip_proxy = options.proxy
 
         # Determine if we can prompt the user for authentication or not
         session.auth.prompting = not options.no_input

{pip-24.3 → pip-25.0}/src/pip/_internal/cli/progress_bars.py

@@ -63,7 +63,7 @@ def _raw_progress_bar(
     size: Optional[int],
 ) -> Generator[bytes, None, None]:
     def write_progress(current: int, total: int) -> None:
-        sys.stdout.write("Progress %d of %d\n" % (current, total))
+        sys.stdout.write(f"Progress {current} of {total}\n")
         sys.stdout.flush()
 
     current = 0

{pip-24.3 → pip-25.0}/src/pip/_internal/commands/cache.py

@@ -8,6 +8,7 @@ from pip._internal.cli.status_codes import ERROR, SUCCESS
 from pip._internal.exceptions import CommandError, PipError
 from pip._internal.utils import filesystem
 from pip._internal.utils.logging import getLogger
+from pip._internal.utils.misc import format_size
 
 logger = getLogger(__name__)
 
@@ -180,10 +181,12 @@ class CacheCommand(Command):
         if not files:
             logger.warning(no_matching_msg)
 
+        bytes_removed = 0
         for filename in files:
+            bytes_removed += os.stat(filename).st_size
             os.unlink(filename)
             logger.verbose("Removed %s", filename)
-        logger.info("Files removed: %s", len(files))
+        logger.info("Files removed: %s (%s)", len(files), format_size(bytes_removed))
 
     def purge_cache(self, options: Values, args: List[Any]) -> None:
         if args: