Merge branch 'main' into update-setuptools

pypa · Feb 13, 2023 · 39d28cc · 39d28cc
2 parents 85da66d + 852dedd
commit 39d28cc
Show file tree

Hide file tree

Showing 71 changed files with 350 additions and 193 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -128,6 +128,7 @@ Chris Hunt
 Chris Jerdonek
 Chris McDonough
 Chris Pawley
+Chris Pryer
 Chris Wolfe
 Christian Clauss
 Christian Heimes
@@ -169,7 +170,9 @@ Daniel Jost
 Daniel Katz
 Daniel Shaulov
 Daniele Esposti
+Daniele Nicolodi
 Daniele Procida
+Daniil Konovalenko
 Danny Hermes
 Danny McClanahan
 Darren Kavanagh
@@ -200,13 +203,15 @@ Diego Caraballo
 Diego Ramirez
 DiegoCaraballo
 Dimitri Merejkowsky
+Dimitri Papadopoulos
 Dirk Stolle
 Dmitry Gladkov
 Dmitry Volodin
 Domen Kožar
 Dominic Davis-Foster
 Donald Stufft
 Dongweiming
+doron zarhi
 Douglas Thor
 DrFeathers
 Dustin Ingram
@@ -282,6 +287,7 @@ hauntsaninja
 Henrich Hartzer
 Henry Schreiner
 Herbert Pfennig
+Holly Stotelmyer
 Hsiaoming Yang
 Hugo Lopes Tavares
 Hugo van Kemenade
@@ -305,6 +311,7 @@ Jacob Kim
 Jacob Walls
 Jaime Sanz
 jakirkham
+Jakub Kuczys
 Jakub Stasiak
 Jakub Vysoky
 Jakub Wilk
@@ -317,6 +324,7 @@ Jan Pokorný
 Jannis Leidel
 Jarek Potiuk
 jarondl
+Jason Curtis
 Jason R. Coombs
 Jay Graves
 Jean-Christophe Fillion-Robin
@@ -342,6 +350,7 @@ Jon Dufresne
 Jon Parise
 Jonas Nockert
 Jonathan Herbert
+Joonatan Partanen
 Joost Molenaar
 Jorge Niedbalski
 Joseph Bylund
@@ -350,6 +359,7 @@ Josh Bronson
 Josh Hansen
 Josh Schneier
 Juanjo Bazán
+Judah Rand
 Julian Berman
 Julian Gethmann
 Julien Demoor
@@ -455,6 +465,7 @@ Miro Hrončok
 Monica Baluna
 montefra
 Monty Taylor
+Muha Ajjan‮
 Nadav Wexler
 Nahuel Ambrosini
 Nate Coraor
@@ -484,6 +495,7 @@ nvdv
 OBITORASU
 Ofek Lev
 ofrinevo
+Oliver Freund
 Oliver Jeeves
 Oliver Mannion
 Oliver Tonnhofer
@@ -555,6 +567,7 @@ Riccardo Schirone
 Richard Jones
 Richard Si
 Ricky Ng-Adam
+Rishi
 RobberPhex
 Robert Collins
 Robert McGibbon
@@ -605,6 +618,7 @@ Stavros Korokithakis
 Stefan Scherfke
 Stefano Rivera
 Stephan Erb
+Stephen Rosen
 stepshal
 Steve (Gadget) Barnes
 Steve Barnes
@@ -644,6 +658,7 @@ Tom V
 Tomas Hrnciar
 Tomas Orsava
 Tomer Chachamu
+Tommi Enenkel | AnB
 Tomáš Hrnčiar
 Tony Beswick
 Tony Narlock
@@ -672,6 +687,7 @@ Wil Tan
 Wilfred Hughes
 William ML Leslie
 William T Olson
+William Woodruff
 Wilson Mo
 wim glenn
 Winson Luk

diff --git a/NEWS.rst b/NEWS.rst
@@ -9,6 +9,63 @@
 
 .. towncrier release notes start
 
+23.0 (2023-01-30)
+=================
+
+Features
+--------
+
+- Change the hashes in the installation report to be a mapping. Emit the
+  ``archive_info.hashes`` dictionary in ``direct_url.json``. (`#11312 <https://github.com/pypa/pip/issues/11312>`_)
+- Implement logic to read the ``EXTERNALLY-MANAGED`` file as specified in PEP 668.
+  This allows a downstream Python distributor to prevent users from using pip to
+  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 stable, and their version
+  has been bumped from ``0`` to ``1``. (`#11757 <https://github.com/pypa/pip/issues/11757>`_)
+
+Bug Fixes
+---------
+
+- Wheel cache behavior is restored to match previous versions, allowing the
+  cache to find existing entries. (`#11527 <https://github.com/pypa/pip/issues/11527>`_)
+- Use the "venv" scheme if available to obtain prefixed lib paths. (`#11598 <https://github.com/pypa/pip/issues/11598>`_)
+- Deprecated a historical ambiguity in how ``egg`` fragments in URL-style
+  requirements are formatted and handled. ``egg`` fragments that do not look
+  like PEP 508 names now produce a deprecation warning. (`#11617 <https://github.com/pypa/pip/issues/11617>`_)
+- Fix scripts path in isolated build environment on Debian. (`#11623 <https://github.com/pypa/pip/issues/11623>`_)
+- Make ``pip show`` show the editable location if package is editable (`#11638 <https://github.com/pypa/pip/issues/11638>`_)
+- Stop checking that ``wheel`` is present when ``build-system.requires``
+  is provided without ``build-system.build-backend`` as ``setuptools``
+  (which we still check for) will inject it anyway. (`#11673 <https://github.com/pypa/pip/issues/11673>`_)
+- Fix an issue when an already existing in-memory distribution would cause
+  exceptions in ``pip install`` (`#11704 <https://github.com/pypa/pip/issues/11704>`_)
+
+Vendored Libraries
+------------------
+
+- Upgrade certifi to 2022.12.7
+- Upgrade chardet to 5.1.0
+- Upgrade colorama to 0.4.6
+- Upgrade distro to 1.8.0
+- Remove pep517 from vendored packages
+- Upgrade platformdirs to 2.6.2
+- Add pyproject-hooks 1.0.0
+- Upgrade requests to 2.28.2
+- Upgrade rich to 12.6.0
+- Upgrade urllib3 to 1.26.14
+
+Improved Documentation
+----------------------
+
+- Fixed the description of the option "--install-options" in the documentation (`#10265 <https://github.com/pypa/pip/issues/10265>`_)
+- Remove mention that editable installs are necessary for pip freeze to report the VCS
+  URL. (`#11675 <https://github.com/pypa/pip/issues/11675>`_)
+- Clarify that the egg URL fragment is only necessary for editable VCS installs, and
+  otherwise not necessary anymore. (`#11676 <https://github.com/pypa/pip/issues/11676>`_)
+
+
 22.3.1 (2022-11-05)
 ===================
 

diff --git a/docs/html/topics/configuration.md b/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

diff --git a/news/10265.removal.rst b/news/10265.removal.rst
diff --git a/news/11312.feature.rst b/news/11312.feature.rst
diff --git a/news/11381.feature.rst b/news/11381.feature.rst
diff --git a/news/11527.bugfix.rst b/news/11527.bugfix.rst
diff --git a/news/11529.bugfix.rst 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/11589.feature.rst b/news/11589.feature.rst
diff --git a/news/11598.bugfix.rst b/news/11598.bugfix.rst
diff --git a/news/11617.bugfix.rst b/news/11617.bugfix.rst
diff --git a/news/11623.bugfix.rst b/news/11623.bugfix.rst
diff --git a/news/11638.bugfix.rst b/news/11638.bugfix.rst
diff --git a/news/11671.feature.rst b/news/11671.feature.rst
@@ -0,0 +1 @@
+Ignore PIP_REQUIRE_VIRTUALENV for ``pip index``
diff --git a/news/11673.bugfix.rst b/news/11673.bugfix.rst
diff --git a/news/11675.doc.rst b/news/11675.doc.rst
diff --git a/news/11676.doc.rst b/news/11676.doc.rst
diff --git a/news/11704.bugfix.rst b/news/11704.bugfix.rst
diff --git a/news/11740.bugfix.rst b/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.
diff --git a/news/11757.feature.rst b/news/11757.feature.rst
diff --git a/news/11773.bugfix.rst b/news/11773.bugfix.rst
@@ -0,0 +1 @@
+Do not crash in presence of misformatted hash field in ``direct_url.json``.
diff --git a/news/11774.bugfix.rst 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
@@ -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/11780.feature.rst b/news/11780.feature.rst
@@ -0,0 +1,2 @@
+Implement ``--break-system-packages`` to permit installing packages into
+``EXTERNALLY-MANAGED`` Python installations.
diff --git a/news/4e5ddb5b-e740-4ef8-a78a-8d62a144fdde.trivial.rst b/news/4e5ddb5b-e740-4ef8-a78a-8d62a144fdde.trivial.rst
diff --git a/news/704B9286-9572-4871-9B35-C6A8FA66AE75.trivial.rst b/news/704B9286-9572-4871-9B35-C6A8FA66AE75.trivial.rst
diff --git a/news/9752.feature.rst 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/c1da841b-9024-4448-9ae1-6e4a5a5952f0.trivial.rst b/news/c1da841b-9024-4448-9ae1-6e4a5a5952f0.trivial.rst
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
diff --git a/news/chardet.vendor.rst b/news/chardet.vendor.rst
diff --git a/news/colorama.vendor.rst b/news/colorama.vendor.rst
diff --git a/news/d4da20f5-0ed2-480c-baa9-2490e4abdff6.trivial.rst b/news/d4da20f5-0ed2-480c-baa9-2490e4abdff6.trivial.rst
diff --git a/news/distro.vendor.rst b/news/distro.vendor.rst
diff --git a/news/pep517.vendor.rst b/news/pep517.vendor.rst
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
diff --git a/news/pyproject-hooks.vendor.rst b/news/pyproject-hooks.vendor.rst
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst
@@ -0,0 +1 @@
+Upgrade resolvelib to 0.9.0
diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
diff --git a/noxfile.py b/noxfile.py
@@ -1,6 +1,7 @@
 """Automation using nox.
 """
 
+import argparse
 import glob
 import os
 import shutil
@@ -183,7 +184,13 @@ def lint(session: nox.Session) -> None:
 def vendoring(session: nox.Session) -> None:
     session.install("vendoring~=1.2.0")
 
-    if "--upgrade" not in session.posargs:
+    parser = argparse.ArgumentParser(prog="nox -s vendoring")
+    parser.add_argument("--upgrade-all", action="store_true")
+    parser.add_argument("--upgrade", action="append", default=[])
+    parser.add_argument("--skip", action="append", default=[])
+    args = parser.parse_args(session.posargs)
+
+    if not (args.upgrade or args.upgrade_all):
         session.run("vendoring", "sync", "-v")
         return
 
@@ -199,7 +206,9 @@ def pinned_requirements(path: Path) -> Iterator[Tuple[str, str]]:
 
     vendor_txt = Path("src/pip/_vendor/vendor.txt")
     for name, old_version in pinned_requirements(vendor_txt):
-        if name == "setuptools":
+        if name in args.skip:
+            continue
+        if args.upgrade and name not in args.upgrade:
             continue
 
         # update requirements.txt

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "23.0.dev0"
+__version__ = "23.1.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:
Original file line number	Diff line number	Diff line change
		@@ -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.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Ignore PIP_REQUIRE_VIRTUALENV for ``pip index``
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Do not crash in presence of misformatted hash field in ``direct_url.json``.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Correct the way to decide if keyring is available.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Cross-reference the ``--python`` flag from the ``--prefix`` flag,
		and mention limitations of ``--prefix`` regarding script installation.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Implement ``--break-system-packages`` to permit installing packages into
		``EXTERNALLY-MANAGED`` Python installations.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		In the case of virtual environments, configuration files are now also included from the base installation.