From ae23f967efedf33e3da148612657064b3b5a0695 Mon Sep 17 00:00:00 2001
From: Paul Moore
Date: Sat, 15 Jul 2023 10:04:59 +0100
Subject: [PATCH 1/3] Update AUTHORS.txt
---
AUTHORS.txt | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
index f6ece21ce58..299459fa959 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -71,6 +71,7 @@ atse
Atsushi Odagiri
Avinash Karhana
Avner Cohen
+Awit (Ah-Wit) Ghirmai
Baptiste Mispelon
Barney Gale
barneygale
@@ -126,6 +127,7 @@ Chih-Hsuan Yen
Chris Brinker
Chris Hunt
Chris Jerdonek
+Chris Kuehl
Chris McDonough
Chris Pawley
Chris Pryer
@@ -330,6 +332,8 @@ Jarek Potiuk
jarondl
Jason Curtis
Jason R. Coombs
+JasonMo
+JasonMo1
Jay Graves
Jean-Christophe Fillion-Robin
Jeff Barber
@@ -344,6 +348,7 @@ Jim Fisher
Jim Garrison
Jiun Bae
Jivan Amara
+Joe Bylund
Joe Michelini
John Paton
John T. Wodder II
@@ -473,7 +478,7 @@ Miro Hrončok
Monica Baluna
montefra
Monty Taylor
-Muha Ajjan
+Muha Ajjan
Nadav Wexler
Nahuel Ambrosini
Nate Coraor
@@ -582,6 +587,7 @@ Rishi
RobberPhex
Robert Collins
Robert McGibbon
+Robert Pollak
Robert T. McGibbon
robin elisha robinson
Roey Berman
@@ -614,6 +620,7 @@ SeongSoo Cho
Sergey Vasilyev
Seth Michael Larson
Seth Woodworth
+Shantanu
shireenrao
Shivansh-007
Shlomi Fish
@@ -638,6 +645,7 @@ Steve Barnes
Steve Dower
Steve Kowalik
Steven Myint
+Steven Silvester
stonebig
Stéphane Bidoul
Stéphane Bidoul (ACSONE)
@@ -707,6 +715,7 @@ Wilson Mo
wim glenn
Winson Luk
Wolfgang Maier
+Wu Zhenyu
XAMES3
Xavier Fernandez
xoviat
@@ -725,4 +734,4 @@ Zvezdan Petkovic
Łukasz Langa
Роман Донченко
Семён Марьясин
-Martin Häcker
+rekcäH nitraM
From a3c2c43c5309ff219674b1d73a6dbf491a727a5e Mon Sep 17 00:00:00 2001
From: Paul Moore
Date: Sat, 15 Jul 2023 10:05:07 +0100
Subject: [PATCH 2/3] Bump for release
---
NEWS.rst | 54 +++++++++++++++++++
news/11416.bugfix.rst | 1 -
news/11847.bugfix.rst | 1 -
news/11920.bugfix.rst | 1 -
news/11957.bugfix.rst | 1 -
news/11985.bugfix.rst | 1 -
news/11996.process.rst | 1 -
news/12038.bugfix.rst | 1 -
news/12040.feature.rst | 1 -
news/12042.bugfix.rst | 1 -
news/12063.removal.rst | 2 -
news/12067.bugfix.rst | 1 -
news/12079.bugfix.rst | 1 -
news/12119.bugfix.rst | 3 --
...d6-b078-4452-97a1-7d2c1ab41ca1.trivial.rst | 0
news/4256.removal.rst | 4 --
...8B-09FA-49BC-A886-6F5D8885BC14.trivial.rst | 0
news/certifi.vendor.rst | 1 -
news/no-issue.trivial.rst | 2 -
news/platformdirs.vendor.rst | 1 -
news/pygments.vendor.rst | 1 -
news/pyparsing.vendor.rst | 1 -
news/requests.vendor.rst | 1 -
news/rich.vendor.rst | 1 -
news/setuptools.vendor.rst | 1 -
news/typing-extensions.vendor.rst | 1 -
news/typing_extensions.vendor.rst | 1 -
news/urllib3.vendor.rst | 1 -
src/pip/__init__.py | 2 +-
29 files changed, 55 insertions(+), 33 deletions(-)
delete mode 100644 news/11416.bugfix.rst
delete mode 100644 news/11847.bugfix.rst
delete mode 100644 news/11920.bugfix.rst
delete mode 100644 news/11957.bugfix.rst
delete mode 100644 news/11985.bugfix.rst
delete mode 100644 news/11996.process.rst
delete mode 100644 news/12038.bugfix.rst
delete mode 100644 news/12040.feature.rst
delete mode 100644 news/12042.bugfix.rst
delete mode 100644 news/12063.removal.rst
delete mode 100644 news/12067.bugfix.rst
delete mode 100644 news/12079.bugfix.rst
delete mode 100644 news/12119.bugfix.rst
delete mode 100644 news/3297dfd6-b078-4452-97a1-7d2c1ab41ca1.trivial.rst
delete mode 100644 news/4256.removal.rst
delete mode 100644 news/5C12428B-09FA-49BC-A886-6F5D8885BC14.trivial.rst
delete mode 100644 news/certifi.vendor.rst
delete mode 100644 news/no-issue.trivial.rst
delete mode 100644 news/platformdirs.vendor.rst
delete mode 100644 news/pygments.vendor.rst
delete mode 100644 news/pyparsing.vendor.rst
delete mode 100644 news/requests.vendor.rst
delete mode 100644 news/rich.vendor.rst
delete mode 100644 news/setuptools.vendor.rst
delete mode 100644 news/typing-extensions.vendor.rst
delete mode 100644 news/typing_extensions.vendor.rst
delete mode 100644 news/urllib3.vendor.rst
diff --git a/NEWS.rst b/NEWS.rst
index f24aaaa4094..6fa4f94ab1a 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,60 @@
.. towncrier release notes start
+23.2 (2023-07-15)
+=================
+
+Process
+-------
+
+- Deprecate support for eggs for Python 3.11 or later, when the new ``importlib.metadata`` backend is used to load distribution metadata. This only affects the egg *distribution format* (with the ``.egg`` extension); distributions using the ``.egg-info`` *metadata format* (but are not actually eggs) are not affected. For more information about eggs, see `relevant section in the setuptools documentation `__.
+
+Deprecations and Removals
+-------------------------
+
+- Deprecate legacy version and version specifiers that don't conform to `PEP 440
+ `_ (`#12063 `_)
+- ``freeze`` no longer excludes the ``setuptools``, ``distribute``, and ``wheel``
+ from the output when running on Python 3.12 or later, where they are not
+ included in a virtual environment by default. Use ``--exclude`` if you wish to
+ exclude any of these packages. (`#4256 `_)
+
+Features
+--------
+
+- make rejection messages slightly different between 1 and 8, so the user can make the difference. (`#12040 `_)
+
+Bug Fixes
+---------
+
+- Fix ``pip completion --zsh``. (`#11416 `_)
+- Prevent downloading files twice when PEP 658 metadata is present (`#11847 `_)
+- Add permission check before configuration (`#11920 `_)
+- Fix deprecation warnings in Python 3.12 for usage of shutil.rmtree (`#11957 `_)
+- Ignore invalid or unreadable ``origin.json`` files in the cache of locally built wheels. (`#11985 `_)
+- Fix installation of packages with PEP658 metadata using non-canonicalized names (`#12038 `_)
+- Correctly parse ``dist-info-metadata`` values from JSON-format index data. (`#12042 `_)
+- Fail with an error if the ``--python`` option is specified after the subcommand name. (`#12067 `_)
+- Fix slowness when using ``importlib.metadata`` (the default way for pip to read metadata in Python 3.11+) and there is a large overlap between already installed and to-be-installed packages. (`#12079 `_)
+- Pass the ``-r`` flag to mercurial to be explicit that a revision is passed and protect
+ against ``hg`` options injection as part of VCS URLs. Users that do not have control on
+ VCS URLs passed to pip are advised to upgrade. (`#12119 `_)
+
+Vendored Libraries
+------------------
+
+- Upgrade certifi to 2023.5.7
+- Upgrade platformdirs to 3.8.1
+- Upgrade pygments to 2.15.1
+- Upgrade pyparsing to 3.1.0
+- Upgrade Requests to 2.31.0
+- Upgrade rich to 13.4.2
+- Upgrade setuptools to 68.0.0
+- Updated typing_extensions to 4.6.0
+- Upgrade typing_extensions to 4.7.1
+- Upgrade urllib3 to 1.26.16
+
+
23.1.2 (2023-04-26)
===================
diff --git a/news/11416.bugfix.rst b/news/11416.bugfix.rst
deleted file mode 100644
index 3815b2da864..00000000000
--- a/news/11416.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``pip completion --zsh``.
diff --git a/news/11847.bugfix.rst b/news/11847.bugfix.rst
deleted file mode 100644
index 1cad477eaa2..00000000000
--- a/news/11847.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Prevent downloading files twice when PEP 658 metadata is present
diff --git a/news/11920.bugfix.rst b/news/11920.bugfix.rst
deleted file mode 100644
index d8e22ee9bd7..00000000000
--- a/news/11920.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add permission check before configuration
diff --git a/news/11957.bugfix.rst b/news/11957.bugfix.rst
deleted file mode 100644
index 8d72e1733a0..00000000000
--- a/news/11957.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix deprecation warnings in Python 3.12 for usage of shutil.rmtree
diff --git a/news/11985.bugfix.rst b/news/11985.bugfix.rst
deleted file mode 100644
index 66c8e878681..00000000000
--- a/news/11985.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Ignore invalid or unreadable ``origin.json`` files in the cache of locally built wheels.
diff --git a/news/11996.process.rst b/news/11996.process.rst
deleted file mode 100644
index d585bd39183..00000000000
--- a/news/11996.process.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate support for eggs for Python 3.11 or later, when the new ``importlib.metadata`` backend is used to load distribution metadata. This only affects the egg *distribution format* (with the ``.egg`` extension); distributions using the ``.egg-info`` *metadata format* (but are not actually eggs) are not affected. For more information about eggs, see `relevant section in the setuptools documentation `__.
diff --git a/news/12038.bugfix.rst b/news/12038.bugfix.rst
deleted file mode 100644
index 184d88dd826..00000000000
--- a/news/12038.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix installation of packages with PEP658 metadata using non-canonicalized names
diff --git a/news/12040.feature.rst b/news/12040.feature.rst
deleted file mode 100644
index beff856f9c7..00000000000
--- a/news/12040.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-make rejection messages slightly different between 1 and 8, so the user can make the difference.
diff --git a/news/12042.bugfix.rst b/news/12042.bugfix.rst
deleted file mode 100644
index 34d97743540..00000000000
--- a/news/12042.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Correctly parse ``dist-info-metadata`` values from JSON-format index data.
diff --git a/news/12063.removal.rst b/news/12063.removal.rst
deleted file mode 100644
index 037b0c6089a..00000000000
--- a/news/12063.removal.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Deprecate legacy version and version specifiers that don't conform to `PEP 440
-`_
diff --git a/news/12067.bugfix.rst b/news/12067.bugfix.rst
deleted file mode 100644
index 87d76bc2b06..00000000000
--- a/news/12067.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fail with an error if the ``--python`` option is specified after the subcommand name.
diff --git a/news/12079.bugfix.rst b/news/12079.bugfix.rst
deleted file mode 100644
index 5ee05026808..00000000000
--- a/news/12079.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix slowness when using ``importlib.metadata`` (the default way for pip to read metadata in Python 3.11+) and there is a large overlap between already installed and to-be-installed packages.
diff --git a/news/12119.bugfix.rst b/news/12119.bugfix.rst
deleted file mode 100644
index da8d8b04dcd..00000000000
--- a/news/12119.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Pass the ``-r`` flag to mercurial to be explicit that a revision is passed and protect
-against ``hg`` options injection as part of VCS URLs. Users that do not have control on
-VCS URLs passed to pip are advised to upgrade.
diff --git a/news/3297dfd6-b078-4452-97a1-7d2c1ab41ca1.trivial.rst b/news/3297dfd6-b078-4452-97a1-7d2c1ab41ca1.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/4256.removal.rst b/news/4256.removal.rst
deleted file mode 100644
index eb89898501b..00000000000
--- a/news/4256.removal.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-``freeze`` no longer excludes the ``setuptools``, ``distribute``, and ``wheel``
-from the output when running on Python 3.12 or later, where they are not
-included in a virtual environment by default. Use ``--exclude`` if you wish to
-exclude any of these packages.
diff --git a/news/5C12428B-09FA-49BC-A886-6F5D8885BC14.trivial.rst b/news/5C12428B-09FA-49BC-A886-6F5D8885BC14.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
deleted file mode 100644
index 68018f44a54..00000000000
--- a/news/certifi.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade certifi to 2023.5.7
diff --git a/news/no-issue.trivial.rst b/news/no-issue.trivial.rst
deleted file mode 100644
index 6440f668716..00000000000
--- a/news/no-issue.trivial.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added seperate instructions for installing ``nox`` in the ``docs/development/getting-started.rst`` doc. and slight update
-to the below ``Running pip From Source Tree`` section.
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
deleted file mode 100644
index f396d84a666..00000000000
--- a/news/platformdirs.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade platformdirs to 3.8.1
diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
deleted file mode 100644
index b8aa9e56358..00000000000
--- a/news/pygments.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pygments to 2.15.1
diff --git a/news/pyparsing.vendor.rst b/news/pyparsing.vendor.rst
deleted file mode 100644
index 9feffb2460f..00000000000
--- a/news/pyparsing.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pyparsing to 3.1.0
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
deleted file mode 100644
index cf10d8cbb85..00000000000
--- a/news/requests.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade Requests to 2.31.0
diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
deleted file mode 100644
index 9f44d8bdfcd..00000000000
--- a/news/rich.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade rich to 13.4.2
diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
deleted file mode 100644
index 1bbb489934c..00000000000
--- a/news/setuptools.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade setuptools to 68.0.0
diff --git a/news/typing-extensions.vendor.rst b/news/typing-extensions.vendor.rst
deleted file mode 100644
index 6c95fc1b8d7..00000000000
--- a/news/typing-extensions.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated typing_extensions to 4.6.0
diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
deleted file mode 100644
index 6a18f7f2ff0..00000000000
--- a/news/typing_extensions.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade typing_extensions to 4.7.1
diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
deleted file mode 100644
index b446ff9a6ca..00000000000
--- a/news/urllib3.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade urllib3 to 1.26.16
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 20d8bf56c17..696541ddfb5 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
from typing import List, Optional
-__version__ = "23.2.dev0"
+__version__ = "23.2"
def main(args: Optional[List[str]] = None) -> int:
From b6a2670599ded25ffcebc33b5c8b583ccef87f27 Mon Sep 17 00:00:00 2001
From: Paul Moore
Date: Sat, 15 Jul 2023 10:05:07 +0100
Subject: [PATCH 3/3] Bump for development
---
src/pip/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 696541ddfb5..00ce8ad456d 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
from typing import List, Optional
-__version__ = "23.2"
+__version__ = "23.3.dev0"
def main(args: Optional[List[str]] = None) -> int: