Merge branch 'main' into main

27 files changed, 25 insertions, 12 deletions

diff --git a/news/10531.bugfix.rst b/news/10531.bugfix.rst
deleted file mode 100644
index 0a33944a1..000000000
--- a/news/10531.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Always refuse installing or building projects that have no ``pyproject.toml`` nor
-``setup.py``.
diff --git a/news/10565.bugfix.rst b/news/10565.bugfix.rst
deleted file mode 100644
index 2f0141ffd..000000000
--- a/news/10565.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Tweak running-as-root detection, to check ``os.getuid`` if it exists, on Unix-y and non-Linux/non-MacOS machines.
diff --git a/news/10573.bugfix.rst b/news/10573.bugfix.rst
deleted file mode 100644
index 5b69ab6d7..000000000
--- a/news/10573.bugfix.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-When installing projects with a ``pyproject.toml`` in editable mode, and the build
-backend does not support :pep:`660`, prepare metadata using
-``prepare_metadata_for_build_wheel`` instead of ``setup.py egg_info``. Also, refuse
-installing projects that only have a ``setup.cfg`` and no ``setup.py`` nor
-``pyproject.toml``. These restore the pre-21.3 behaviour.
diff --git a/news/10585.bugfix.rst b/news/10585.bugfix.rst
deleted file mode 100644
index 9e78a4609..000000000
--- a/news/10585.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore compatibility of where configuration files are loaded from on MacOS (back to ``Library/Application Support/pip``, instead of ``Preferences/pip``).
diff --git a/news/10588.feature.rst b/news/10588.feature.rst
deleted file mode 100644
index c8985b7a0..000000000
--- a/news/10588.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Documents the ``--require-virtualenv`` flag for ``pip install``.
diff --git a/news/10593.trivial.rst b/news/10593.trivial.rst
deleted file mode 100644
index e69de29bb..000000000
--- a/news/10593.trivial.rst
+++ /dev/null
diff --git a/news/10937.feature.rst b/news/10937.feature.rst
new file mode 100644
index 000000000..2974c577a
--- /dev/null
+++ b/news/10937.feature.rst
@@ -0,0 +1 @@
+Present conflict information during installation after each choice that is rejected (pass ``-vv`` to ``pip install`` to show it)
diff --git a/news/11169.feature.rst b/news/11169.feature.rst
new file mode 100644
index 000000000..54cc6637b
--- /dev/null
+++ b/news/11169.feature.rst
@@ -0,0 +1 @@
+Display dependency chain on each Collecting/Processing log line.
diff --git a/news/11358.removal.rst b/news/11358.removal.rst
new file mode 100644
index 000000000..23e388a9a
--- /dev/null
+++ b/news/11358.removal.rst
@@ -0,0 +1 @@
+Remove support for the deprecated ``--install-options``.
diff --git a/news/11451.removal.rst b/news/11451.removal.rst
new file mode 100644
index 000000000..c0d1100ed
--- /dev/null
+++ b/news/11451.removal.rst
@@ -0,0 +1,2 @@
+``--no-binary`` does not imply ``setup.py install`` anymore. Instead a wheel will be
+built locally and installed.
diff --git a/news/11529.bugfix.rst b/news/11529.bugfix.rst
new file mode 100644
index 000000000..d05e40460
--- /dev/null
+++ b/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.
diff --git a/news/11681.feature.rst b/news/11681.feature.rst
new file mode 100644
index 000000000..00cd05ee1
--- /dev/null
+++ b/news/11681.feature.rst
@@ -0,0 +1,4 @@
+The ``--config-settings``/``-C`` option now supports using the same key multiple
+times. When the same key is specified multiple times, all values are passed to
+the build backend as a list, as opposed to the previous behavior, where pip would
+only pass the last value if the same key was used multiple times.
diff --git a/news/11774.bugfix.rst b/news/11774.bugfix.rst
new file mode 100644
index 000000000..771246b0b
--- /dev/null
+++ b/news/11774.bugfix.rst
@@ -0,0 +1 @@
+Correct the way to decide if keyring is available.
diff --git a/news/11775.doc.rst b/news/11775.doc.rst
new file mode 100644
index 000000000..18274b769
--- /dev/null
+++ b/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.
diff --git a/news/11809.doc.rst b/news/11809.doc.rst
new file mode 100644
index 000000000..68c49ea50
--- /dev/null
+++ b/news/11809.doc.rst
@@ -0,0 +1 @@
+Add SECURITY.md to make the policy offical.
diff --git a/news/11837.bugfix.rst b/news/11837.bugfix.rst
new file mode 100644
index 000000000..6d33ed680
--- /dev/null
+++ b/news/11837.bugfix.rst
@@ -0,0 +1 @@
+More consistent resolution backtracking by removing legacy hack related to setuptools resolution
diff --git a/news/11838.doc.rst b/news/11838.doc.rst
new file mode 100644
index 000000000..9630aa598
--- /dev/null
+++ b/news/11838.doc.rst
@@ -0,0 +1 @@
+Add username to Git over SSH example.
diff --git a/news/11842.doc.rst b/news/11842.doc.rst
new file mode 100644
index 000000000..bd063996f
--- /dev/null
+++ b/news/11842.doc.rst
@@ -0,0 +1,2 @@
+Quote extras in the pip install docs to guard shells with default glob
+qualifiers, like zsh.
diff --git a/news/11882.bugfix.rst b/news/11882.bugfix.rst
new file mode 100644
index 000000000..5373487b1
--- /dev/null
+++ b/news/11882.bugfix.rst
@@ -0,0 +1 @@
+Include ``AUTHORS.txt`` in pip's wheels.
diff --git a/news/8719.feature.rst b/news/8719.feature.rst
new file mode 100644
index 000000000..3f3caf2db
--- /dev/null
+++ b/news/8719.feature.rst
@@ -0,0 +1 @@
+Add ``--keyring-provider`` flag. See the Authentication page in the documentation for more info.
diff --git a/news/9752.feature.rst b/news/9752.feature.rst
new file mode 100644
index 000000000..d515267be
--- /dev/null
+++ b/news/9752.feature.rst
@@ -0,0 +1 @@
+In the case of virtual environments, configuration files are now also included from the base installation.
diff --git a/news/FD80732D-5DC1-4B68-BDB5-0283EF9EBC3A.trivial.rst b/news/FD80732D-5DC1-4B68-BDB5-0283EF9EBC3A.trivial.rst
deleted file mode 100644
index e69de29bb..000000000
--- a/news/FD80732D-5DC1-4B68-BDB5-0283EF9EBC3A.trivial.rst
+++ /dev/null
diff --git a/news/pep517.vendor.rst b/news/pep517.vendor.rst
deleted file mode 100644
index 2f9070b9c..000000000
--- a/news/pep517.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pep517 to 0.12.0
diff --git a/news/pkg_resources.vendor.rst b/news/pkg_resources.vendor.rst
new file mode 100644
index 000000000..a20817dfb
--- /dev/null
+++ b/news/pkg_resources.vendor.rst
@@ -0,0 +1 @@
+Patch pkg_resources to remove dependency on ``jaraco.text``.
diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst
index 50f702cc9..c8b5c928d 100644
--- a/news/resolvelib.vendor.rst
+++ b/news/resolvelib.vendor.rst
@@ -1 +1 @@
-Upgrade resolvelib to 0.8.1
+Upgrade resolvelib to 0.9.0
diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
new file mode 100644
index 000000000..f86cecbca
--- /dev/null
+++ b/news/setuptools.vendor.rst
@@ -0,0 +1 @@
+Update pkg_resources (via setuptools) to 65.6.3
diff --git a/news/short-config-settings-option.feature.rst b/news/short-config-settings-option.feature.rst
new file mode 100644
index 000000000..0da7f8637
--- /dev/null
+++ b/news/short-config-settings-option.feature.rst
@@ -0,0 +1 @@
+Add ``-C`` as a short version of the ``--config-settings`` option.