Merge pull request #9177 from pradyunsg/release/20.3

25 files changed, 52 insertions, 29 deletions

diff --git a/AUTHORS.txt b/AUTHORS.txt
index f6fe855d7..7ab324ce4 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -79,6 +79,8 @@ Benjamin Peterson
 Benjamin VanEvery
 Benoit Pierre
 Berker Peksag
+Bernard
+Bernard Tyers
 Bernardo B. Marques
 Bernhard M. Wiedemann
 Bertil Hatt
diff --git a/NEWS.rst b/NEWS.rst
index fffba7cf3..feff15919 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,55 @@
 
 .. towncrier release notes start
 
+20.3 (2020-11-30)
+=================
+
+Deprecations and Removals
+-------------------------
+
+- Remove --unstable-feature flag as it has been deprecated. (`#9133 <https://github.com/pypa/pip/issues/9133>`_)
+
+Features
+--------
+
+- Add support for :pep:`600`: Future 'manylinux' Platform Tags for Portable Linux Built Distributions. (`#9077 <https://github.com/pypa/pip/issues/9077>`_)
+- The new resolver now resolves packages in a deterministic order. (`#9100 <https://github.com/pypa/pip/issues/9100>`_)
+- Add support for MacOS Big Sur compatibility tags. (`#9138 <https://github.com/pypa/pip/issues/9138>`_)
+
+Bug Fixes
+---------
+
+- New Resolver: Rework backtracking and state management, to avoid getting stuck in an infinite loop. (`#9011 <https://github.com/pypa/pip/issues/9011>`_)
+- New resolver: Check version equality with ``packaging.version`` to avoid edge
+  cases if a wheel used different version normalization logic in its filename
+  and metadata. (`#9083 <https://github.com/pypa/pip/issues/9083>`_)
+- New resolver: Show each requirement in the conflict error message only once to reduce cluttering. (`#9101 <https://github.com/pypa/pip/issues/9101>`_)
+- Fix a regression that made ``pip wheel`` generate zip files of editable
+  requirements in the wheel directory. (`#9122 <https://github.com/pypa/pip/issues/9122>`_)
+- Fix ResourceWarning in VCS subprocesses (`#9156 <https://github.com/pypa/pip/issues/9156>`_)
+- Redact auth from URL in help message. (`#9160 <https://github.com/pypa/pip/issues/9160>`_)
+- New Resolver: editable installations are done, regardless of whether
+  the already-installed distribution is editable. (`#9169 <https://github.com/pypa/pip/issues/9169>`_)
+
+Vendored Libraries
+------------------
+
+- Upgrade certifi to 2020.11.8
+- Upgrade colorama to 0.4.4
+- Upgrade packaging to 20.7
+- Upgrade pep517 to 0.9.1
+- Upgrade requests to 2.25.0
+- Upgrade resolvelib to 0.5.3
+- Upgrade toml to 0.10.2
+- Upgrade urllib3 to 1.26.2
+
+Improved Documentation
+----------------------
+
+- Add a section to the User Guide to cover backtracking during dependency resolution. (`#9039 <https://github.com/pypa/pip/issues/9039>`_)
+- Reorder and revise installation instructions to make them easier to follow. (`#9131 <https://github.com/pypa/pip/issues/9131>`_)
+
+
 20.3b1 (2020-10-31)
 ===================
 
diff --git a/news/9011.bugfix.rst b/news/9011.bugfix.rst
deleted file mode 100644
index 4e299dd9b..000000000
--- a/news/9011.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-New Resolver: Rework backtracking and state management, to avoid getting stuck in an infinite loop.
diff --git a/news/9039.doc.rst b/news/9039.doc.rst
deleted file mode 100644
index 37241250d..000000000
--- a/news/9039.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add a section to the User Guide to cover backtracking during dependency resolution.
diff --git a/news/9077.feature.rst b/news/9077.feature.rst
deleted file mode 100644
index f77dacd06..000000000
--- a/news/9077.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add support for :pep:`600`: Future 'manylinux' Platform Tags for Portable Linux Built Distributions.
diff --git a/news/9083.bugfix.rst b/news/9083.bugfix.rst
deleted file mode 100644
index 97fc552b6..000000000
--- a/news/9083.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-New resolver: Check version equality with ``packaging.version`` to avoid edge
-cases if a wheel used different version normalization logic in its filename
-and metadata.
diff --git a/news/9100.feature.rst b/news/9100.feature.rst
deleted file mode 100644
index eb6c72839..000000000
--- a/news/9100.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-The new resolver now resolves packages in a deterministic order.
diff --git a/news/9101.bugfix.rst b/news/9101.bugfix.rst
deleted file mode 100644
index 441f2a931..000000000
--- a/news/9101.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-New resolver: Show each requirement in the conflict error message only once to reduce cluttering.
diff --git a/news/9122.bugfix.rst b/news/9122.bugfix.rst
deleted file mode 100644
index da2ae5e5f..000000000
--- a/news/9122.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a regression that made ``pip wheel`` generate zip files of editable
-requirements in the wheel directory.
diff --git a/news/9131.doc.rst b/news/9131.doc.rst
deleted file mode 100644
index 18862aa55..000000000
--- a/news/9131.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Reorder and revise installation instructions to make them easier to follow.
diff --git a/news/9133.removal.rst b/news/9133.removal.rst
deleted file mode 100644
index 876e89b13..000000000
--- a/news/9133.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove --unstable-feature flag as it has been deprecated.
diff --git a/news/9138.feature.rst b/news/9138.feature.rst
deleted file mode 100644
index 98009cdd1..000000000
--- a/news/9138.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add support for MacOS Big Sur compatibility tags.
diff --git a/news/9156.bugfix.rst b/news/9156.bugfix.rst
deleted file mode 100644
index 9b433fae2..000000000
--- a/news/9156.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ResourceWarning in VCS subprocesses
diff --git a/news/9160.bugfix.rst b/news/9160.bugfix.rst
deleted file mode 100644
index fad6dc1f0..000000000
--- a/news/9160.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Redact auth from URL in help message.
diff --git a/news/9169.bugfix.rst b/news/9169.bugfix.rst
deleted file mode 100644
index 299ec2733..000000000
--- a/news/9169.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-New Resolver: editable installations are done, regardless of whether
-the already-installed distribution is editable.
diff --git a/news/9171.trivial.rst b/news/9171.trivial.rst
deleted file mode 100644
index ca02166a2..000000000
--- a/news/9171.trivial.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed moving the ``:orphan:`` to top of documents in the Sphinx
-extension for collecting the UX feedback from docs (initially
-introduced in PR #8848).
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
deleted file mode 100644
index b181bc30c..000000000
--- a/news/certifi.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade certifi to 2020.11.8
diff --git a/news/colorama.vendor.rst b/news/colorama.vendor.rst
deleted file mode 100644
index 30c755eb0..000000000
--- a/news/colorama.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade colorama to 0.4.4
diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
deleted file mode 100644
index 4e49a4639..000000000
--- a/news/packaging.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade packaging to 20.7
diff --git a/news/pep517.vendor.rst b/news/pep517.vendor.rst
deleted file mode 100644
index 945f1e746..000000000
--- a/news/pep517.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pep517 to 0.9.1
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
deleted file mode 100644
index 515ca25a9..000000000
--- a/news/requests.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade requests to 2.25.0
diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst
deleted file mode 100644
index 52d32af8b..000000000
--- a/news/resolvelib.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade resolvelib to 0.5.3
diff --git a/news/toml.vendor.rst b/news/toml.vendor.rst
deleted file mode 100644
index 566c104f8..000000000
--- a/news/toml.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade toml to 0.10.2
diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
deleted file mode 100644
index 10e1e7b45..000000000
--- a/news/urllib3.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade urllib3 to 1.26.2
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index cd0929713..ae0fe9a9f 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -4,7 +4,7 @@ if MYPY_CHECK_RUNNING:
     from typing import List, Optional
 
 
-__version__ = "20.3.dev1"
+__version__ = "21.0.dev0"
 
 
 def main(args=None):