Merge branch 'main' into keyring-multi-choice

# Conflicts:
#	src/pip/_internal/network/auth.py

Author: Dos Moonen

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

MANIFEST.in

@@ -2,6 +2,7 @@ include AUTHORS.txt
 include LICENSE.txt
 include NEWS.rst
 include README.rst
+include SECURITY.md
 include pyproject.toml
 
 include src/pip/_vendor/README.rst

NEWS.rst

@@ -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

SECURITY.md

@@ -50,6 +50,8 @@ drop = [
   "easy_install.py",
   "setuptools",
   "pkg_resources/_vendor/",
+  "_distutils_hack",
+  "distutils-precedence.pth",
   "pkg_resources/extern/",
   # trim vendored pygments styles and lexers
   "pygments/styles/[!_]*.py",