Merge branch 'main' into release/23.0.1

Author: pradyunsg

NEWS.rst

@@ -41,7 +41,7 @@ Features
   modify the externally managed environment. (`#11381 <https://github.com/pypa/pip/issues/11381>`_)
 - Enable the use of ``keyring`` found on ``PATH``. This allows ``keyring``
   installed using ``pipx`` to be used by ``pip``. (`#11589 <https://github.com/pypa/pip/issues/11589>`_)
-- The inspect and installation report formats are now declared stabled, and their version
+- The inspect and installation report formats are now declared stable, and their version
   has been bumped from ``0`` to ``1``. (`#11757 <https://github.com/pypa/pip/issues/11757>`_)
 
 Bug Fixes

docs/html/topics/configuration.md

@@ -19,13 +19,14 @@ and how they are related to pip's various command line options.
 
 ## Configuration Files
 
-Configuration files can change the default values for command line option.
-They are written using a standard INI style configuration files.
+Configuration files can change the default values for command line options.
+They are written using standard INI style configuration files.
 
-pip has 3 "levels" of configuration files:
+pip has 4 "levels" of configuration files:
 
-- `global`: system-wide configuration file, shared across users.
-- `user`: per-user configuration file.
+- `global`: system-wide configuration file, shared across all users.
+- `user`: per-user configuration file, shared across all environments.
+- `base` : per-base environment configuration file, shared across all virtualenvs with the same base. (available since pip 23.0)
 - `site`: per-environment configuration file; i.e. per-virtualenv.
 
 ### Location
@@ -47,6 +48,9 @@ User
 
   The legacy "per-user" configuration file is also loaded, if it exists: {file}`$HOME/.pip/pip.conf`.
 
+Base
+: {file}`\{sys.base_prefix\}/pip.conf`
+
 Site
 : {file}`$VIRTUAL_ENV/pip.conf`
 ```
@@ -63,6 +67,9 @@ User
 
   The legacy "per-user" configuration file is also loaded, if it exists: {file}`$HOME/.pip/pip.conf`.
 
+Base
+: {file}`\{sys.base_prefix\}/pip.conf`
+
 Site
 : {file}`$VIRTUAL_ENV/pip.conf`
 ```
@@ -81,6 +88,9 @@ User
 
   The legacy "per-user" configuration file is also loaded, if it exists: {file}`%HOME%\\pip\\pip.ini`
 
+Base
+: {file}`\{sys.base_prefix\}\\pip.ini`
+
 Site
 : {file}`%VIRTUAL_ENV%\\pip.ini`
 ```
@@ -102,6 +112,7 @@ order:
 - `PIP_CONFIG_FILE`, if given.
 - Global
 - User
+- Base
 - Site
 
 Each file read overrides any values read from previous files, so if the

news/11529.bugfix.rst

@@ -0,0 +1 @@
+Fix grammar by changing "A new release of pip available:" to "A new release of pip is available:" in the notice used for indicating that.

news/11671.feature.rst

@@ -0,0 +1 @@
+Ignore PIP_REQUIRE_VIRTUALENV for ``pip index``

news/11740.bugfix.rst

@@ -0,0 +1,3 @@
+Improve handling of isolated build environments on platforms that
+customize the Python's installation schemes, such as Debian and
+Homebrew.

news/11773.bugfix.rst

@@ -0,0 +1 @@
+Do not crash in presence of misformatted hash field in ``direct_url.json``.

news/11774.bugfix.rst

@@ -0,0 +1 @@
+Correct the way to decide if keyring is available.

news/11775.doc.rst

@@ -0,0 +1,2 @@
+Cross-reference the ``--python`` flag from the ``--prefix`` flag,
+and mention limitations of ``--prefix`` regarding script installation.

news/11780.feature.rst

@@ -0,0 +1,2 @@
+Implement ``--break-system-packages`` to permit installing packages into
+``EXTERNALLY-MANAGED`` Python installations.

news/9752.feature.rst

@@ -0,0 +1 @@
+In the case of virtual environments, configuration files are now also included from the base installation.