From f03051540ca60bc5653129048f5171aeb415db26 Mon Sep 17 00:00:00 2001
From: Paul Moore
Date: Sat, 23 Jan 2021 14:39:29 +0000
Subject: [PATCH] Revert "Bump for release"
This reverts commit 91f43f1fd4e4daf5d8fbcd511bf2ba7ad6fd61d2.
---
NEWS.rst | 46 -------------------
...6d-b127-4551-a404-404b0ee8dcd3.trivial.rst | 0
...15-1373-4226-a1ec-efe54b7ad480.trivial.rst | 0
news/1884.feature.rst | 1 +
...4f-502c-4213-b8b8-c9173718e8ab.trivial.rst | 0
...61-eaf9-4117-a1a9-d5bb7f93b447.trivial.rst | 0
...e8-ebb1-4eaf-aee0-e5582a8c5d58.trivial.rst | 0
...cb-2fe8-4b0d-8734-303510a7e4ce.trivial.rst | 0
...33-ec03-4b33-8cf1-ff76baa3690e.trivial.rst | 0
...0e-e268-4519-bee7-6f79bc4cf489.trivial.rst | 0
...39-9189-4bc3-bc87-bf598f1c1064.trivial.rst | 0
...a6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst | 0
...91-9583-470e-a263-b196acf4072b.trivial.rst | 0
...f1-5f9a-4f6b-8960-3334570ae591.trivial.rst | 0
...1c-91d6-475c-959a-83485cafa4b2.trivial.rst | 0
...b1-2151-45c3-baa0-b87e50d7e56d.trivial.rst | 0
news/6148.removal.rst | 1 +
...b0-98f9-4e1f-a541-af95fb990af9.trivial.rst | 0
news/7502.removal.rst | 2 +
news/7554.removal.rst | 2 +
...a1-9af6-4190-8249-05a6328e379e.trivial.rst | 0
...fc-938e-457b-ae6e-0905e7443b2f.trivial.rst | 0
...18-3054-41C7-B920-78348DFD01A6.trivial.rst | 0
...f2-1d4e-4067-9b4b-acc6ae741aef.trivial.rst | 0
...cb-0539-41a0-871b-4ffe72765f6f.trivial.rst | 0
news/8802.removal.rst | 1 +
...3d-998e-4924-92e6-2ab2173159f8.trivial.rst | 0
news/9172.doc.rst | 1 +
news/9186.feature.rst | 3 ++
news/9189.removal.rst | 1 +
news/9273.bugfix.rst | 3 ++
news/9337.bugfix.rst | 2 +
news/9338.removal.rst | 2 +
news/9343.doc.rst | 1 +
...42-2198-4760-B5A7-B5A6BB98ECA2.trivial.rst | 0
...e3-bfd3-46ae-b4b6-bcb9784303b4.trivial.rst | 0
...89-8b92-4ec1-a3a1-a6657cf6fd5b.trivial.rst | 0
...e7-d6f3-4f30-9192-6a8e69027d6a.trivial.rst | 0
...46-e6b0-48b1-8b26-1145d611d082.trivial.rst | 0
...d5-38b6-48cc-8136-0c32d3ace838.trivial.rst | 0
...86bc866fdc4257a445e0df09dd7e64.trivial.rst | 0
...cd-059a-4ea4-b02e-343f8b51aad5.trivial.rst | 0
...cc-9fc9-4762-914e-34014e8d09bf.trivial.rst | 0
...60-675c-4104-9825-39d1ee0a20b7.trivial.rst | 0
...2f-aef7-4323-8332-819f0be13d79.trivial.rst | 0
...0a-f673-4c1b-9959-3196b6c000e9.trivial.rst | 0
news/msgpack.vendor.rst | 1 +
news/requests.vendor.rst | 1 +
src/pip/__init__.py | 2 +-
49 files changed, 23 insertions(+), 47 deletions(-)
create mode 100644 news/0dd6ac6d-b127-4551-a404-404b0ee8dcd3.trivial.rst
create mode 100644 news/1170af15-1373-4226-a1ec-efe54b7ad480.trivial.rst
create mode 100644 news/1884.feature.rst
create mode 100644 news/205edb4f-502c-4213-b8b8-c9173718e8ab.trivial.rst
create mode 100644 news/24193261-eaf9-4117-a1a9-d5bb7f93b447.trivial.rst
create mode 100644 news/275aa0e8-ebb1-4eaf-aee0-e5582a8c5d58.trivial.rst
create mode 100644 news/2905cccb-2fe8-4b0d-8734-303510a7e4ce.trivial.rst
create mode 100644 news/2b5d1433-ec03-4b33-8cf1-ff76baa3690e.trivial.rst
create mode 100644 news/30e2240e-e268-4519-bee7-6f79bc4cf489.trivial.rst
create mode 100644 news/3ba38d39-9189-4bc3-bc87-bf598f1c1064.trivial.rst
create mode 100644 news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst
create mode 100644 news/49254991-9583-470e-a263-b196acf4072b.trivial.rst
create mode 100644 news/4a85b5f1-5f9a-4f6b-8960-3334570ae591.trivial.rst
create mode 100644 news/4ec6e91c-91d6-475c-959a-83485cafa4b2.trivial.rst
create mode 100644 news/54754cb1-2151-45c3-baa0-b87e50d7e56d.trivial.rst
create mode 100644 news/6148.removal.rst
create mode 100644 news/738a71b0-98f9-4e1f-a541-af95fb990af9.trivial.rst
create mode 100644 news/7502.removal.rst
create mode 100644 news/7554.removal.rst
create mode 100644 news/7ced09a1-9af6-4190-8249-05a6328e379e.trivial.rst
create mode 100644 news/7edb0afc-938e-457b-ae6e-0905e7443b2f.trivial.rst
create mode 100644 news/80B9D718-3054-41C7-B920-78348DFD01A6.trivial.rst
create mode 100644 news/857785f2-1d4e-4067-9b4b-acc6ae741aef.trivial.rst
create mode 100644 news/86c319cb-0539-41a0-871b-4ffe72765f6f.trivial.rst
create mode 100644 news/8802.removal.rst
create mode 100644 news/8a225e3d-998e-4924-92e6-2ab2173159f8.trivial.rst
create mode 100644 news/9172.doc.rst
create mode 100644 news/9186.feature.rst
create mode 100644 news/9189.removal.rst
create mode 100644 news/9273.bugfix.rst
create mode 100644 news/9337.bugfix.rst
create mode 100644 news/9338.removal.rst
create mode 100644 news/9343.doc.rst
create mode 100644 news/9DE59242-2198-4760-B5A7-B5A6BB98ECA2.trivial.rst
create mode 100644 news/a13640e3-bfd3-46ae-b4b6-bcb9784303b4.trivial.rst
create mode 100644 news/a9950589-8b92-4ec1-a3a1-a6657cf6fd5b.trivial.rst
create mode 100644 news/ae7bdce7-d6f3-4f30-9192-6a8e69027d6a.trivial.rst
create mode 100644 news/b034ad46-e6b0-48b1-8b26-1145d611d082.trivial.rst
create mode 100644 news/b5e475d5-38b6-48cc-8136-0c32d3ace838.trivial.rst
create mode 100644 news/bb86bc866fdc4257a445e0df09dd7e64.trivial.rst
create mode 100644 news/d96bbdcd-059a-4ea4-b02e-343f8b51aad5.trivial.rst
create mode 100644 news/dc9e5ecc-9fc9-4762-914e-34014e8d09bf.trivial.rst
create mode 100644 news/ea24fc60-675c-4104-9825-39d1ee0a20b7.trivial.rst
create mode 100644 news/f0af302f-aef7-4323-8332-819f0be13d79.trivial.rst
create mode 100644 news/f0b01f0a-f673-4c1b-9959-3196b6c000e9.trivial.rst
create mode 100644 news/msgpack.vendor.rst
create mode 100644 news/requests.vendor.rst
diff --git a/NEWS.rst b/NEWS.rst
index 83608ac9c6c..18cc7b70427 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -1,49 +1,3 @@
-21.0 (2021-01-23)
-=================
-
-Deprecations and Removals
--------------------------
-
-- Drop support for Python 2. (`#6148 `_)
-- Remove support for legacy wheel cache entries that were created with pip
- versions older than 20.0. (`#7502 `_)
-- Remove support for VCS pseudo URLs editable requirements. It was emitting
- deprecation warning since version 20.0. (`#7554 `_)
-- Modernise the codebase after Python 2. (`#8802 `_)
-- Drop support for Python 3.5. (`#9189 `_)
-- Remove the VCS export feature that was used only with editable VCS
- requirements and had correctness issues. (`#9338 `_)
-
-Features
---------
-
-- Add ``--ignore-requires-python`` support to pip download. (`#1884 `_)
-- New resolver: Error message shown when a wheel contains inconsistent metadata
- is made more helpful by including both values from the file name and internal
- metadata. (`#9186 `_)
-
-Bug Fixes
----------
-
-- Fix a regression that made ``pip wheel`` do a VCS export instead of a VCS clone
- for editable requirements. This broke VCS requirements that need the VCS
- information to build correctly. (`#9273 `_)
-- Fix ``pip download`` of editable VCS requirements that need VCS information
- to build correctly. (`#9337 `_)
-
-Vendored Libraries
-------------------
-
-- Upgrade msgpack to 1.0.2.
-- Upgrade requests to 2.25.1.
-
-Improved Documentation
-----------------------
-
-- Render the unreleased pip version change notes on the news page in docs. (`#9172 `_)
-- Fix broken email link in docs feedback banners. (`#9343 `_)
-
-
.. note
You should *NOT* be adding new change log entries to this file, this
diff --git a/news/0dd6ac6d-b127-4551-a404-404b0ee8dcd3.trivial.rst b/news/0dd6ac6d-b127-4551-a404-404b0ee8dcd3.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/1170af15-1373-4226-a1ec-efe54b7ad480.trivial.rst b/news/1170af15-1373-4226-a1ec-efe54b7ad480.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/1884.feature.rst b/news/1884.feature.rst
new file mode 100644
index 00000000000..4b0b4180c35
--- /dev/null
+++ b/news/1884.feature.rst
@@ -0,0 +1 @@
+Add ``--ignore-requires-python`` support to pip download.
diff --git a/news/205edb4f-502c-4213-b8b8-c9173718e8ab.trivial.rst b/news/205edb4f-502c-4213-b8b8-c9173718e8ab.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/24193261-eaf9-4117-a1a9-d5bb7f93b447.trivial.rst b/news/24193261-eaf9-4117-a1a9-d5bb7f93b447.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/275aa0e8-ebb1-4eaf-aee0-e5582a8c5d58.trivial.rst b/news/275aa0e8-ebb1-4eaf-aee0-e5582a8c5d58.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/2905cccb-2fe8-4b0d-8734-303510a7e4ce.trivial.rst b/news/2905cccb-2fe8-4b0d-8734-303510a7e4ce.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/2b5d1433-ec03-4b33-8cf1-ff76baa3690e.trivial.rst b/news/2b5d1433-ec03-4b33-8cf1-ff76baa3690e.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/30e2240e-e268-4519-bee7-6f79bc4cf489.trivial.rst b/news/30e2240e-e268-4519-bee7-6f79bc4cf489.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/3ba38d39-9189-4bc3-bc87-bf598f1c1064.trivial.rst b/news/3ba38d39-9189-4bc3-bc87-bf598f1c1064.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst b/news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/49254991-9583-470e-a263-b196acf4072b.trivial.rst b/news/49254991-9583-470e-a263-b196acf4072b.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/4a85b5f1-5f9a-4f6b-8960-3334570ae591.trivial.rst b/news/4a85b5f1-5f9a-4f6b-8960-3334570ae591.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/4ec6e91c-91d6-475c-959a-83485cafa4b2.trivial.rst b/news/4ec6e91c-91d6-475c-959a-83485cafa4b2.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/54754cb1-2151-45c3-baa0-b87e50d7e56d.trivial.rst b/news/54754cb1-2151-45c3-baa0-b87e50d7e56d.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/6148.removal.rst b/news/6148.removal.rst
new file mode 100644
index 00000000000..cf6d85e70ba
--- /dev/null
+++ b/news/6148.removal.rst
@@ -0,0 +1 @@
+Drop support for Python 2.
diff --git a/news/738a71b0-98f9-4e1f-a541-af95fb990af9.trivial.rst b/news/738a71b0-98f9-4e1f-a541-af95fb990af9.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/7502.removal.rst b/news/7502.removal.rst
new file mode 100644
index 00000000000..9f03366ed8e
--- /dev/null
+++ b/news/7502.removal.rst
@@ -0,0 +1,2 @@
+Remove support for legacy wheel cache entries that were created with pip
+versions older than 20.0.
diff --git a/news/7554.removal.rst b/news/7554.removal.rst
new file mode 100644
index 00000000000..d5037d5fdb9
--- /dev/null
+++ b/news/7554.removal.rst
@@ -0,0 +1,2 @@
+Remove support for VCS pseudo URLs editable requirements. It was emitting
+deprecation warning since version 20.0.
diff --git a/news/7ced09a1-9af6-4190-8249-05a6328e379e.trivial.rst b/news/7ced09a1-9af6-4190-8249-05a6328e379e.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/7edb0afc-938e-457b-ae6e-0905e7443b2f.trivial.rst b/news/7edb0afc-938e-457b-ae6e-0905e7443b2f.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/80B9D718-3054-41C7-B920-78348DFD01A6.trivial.rst b/news/80B9D718-3054-41C7-B920-78348DFD01A6.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/857785f2-1d4e-4067-9b4b-acc6ae741aef.trivial.rst b/news/857785f2-1d4e-4067-9b4b-acc6ae741aef.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/86c319cb-0539-41a0-871b-4ffe72765f6f.trivial.rst b/news/86c319cb-0539-41a0-871b-4ffe72765f6f.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/8802.removal.rst b/news/8802.removal.rst
new file mode 100644
index 00000000000..79d8e508166
--- /dev/null
+++ b/news/8802.removal.rst
@@ -0,0 +1 @@
+Modernise the codebase after Python 2.
diff --git a/news/8a225e3d-998e-4924-92e6-2ab2173159f8.trivial.rst b/news/8a225e3d-998e-4924-92e6-2ab2173159f8.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/9172.doc.rst b/news/9172.doc.rst
new file mode 100644
index 00000000000..fc0063766b2
--- /dev/null
+++ b/news/9172.doc.rst
@@ -0,0 +1 @@
+Render the unreleased pip version change notes on the news page in docs.
diff --git a/news/9186.feature.rst b/news/9186.feature.rst
new file mode 100644
index 00000000000..175b5a883ac
--- /dev/null
+++ b/news/9186.feature.rst
@@ -0,0 +1,3 @@
+New resolver: Error message shown when a wheel contains inconsistent metadata
+is made more helpful by including both values from the file name and internal
+metadata.
diff --git a/news/9189.removal.rst b/news/9189.removal.rst
new file mode 100644
index 00000000000..79928cbb15a
--- /dev/null
+++ b/news/9189.removal.rst
@@ -0,0 +1 @@
+Drop support for Python 3.5.
diff --git a/news/9273.bugfix.rst b/news/9273.bugfix.rst
new file mode 100644
index 00000000000..e729ea29446
--- /dev/null
+++ b/news/9273.bugfix.rst
@@ -0,0 +1,3 @@
+Fix a regression that made ``pip wheel`` do a VCS export instead of a VCS clone
+for editable requirements. This broke VCS requirements that need the VCS
+information to build correctly.
diff --git a/news/9337.bugfix.rst b/news/9337.bugfix.rst
new file mode 100644
index 00000000000..e9d08c3ad82
--- /dev/null
+++ b/news/9337.bugfix.rst
@@ -0,0 +1,2 @@
+Fix ``pip download`` of editable VCS requirements that need VCS information
+to build correctly.
diff --git a/news/9338.removal.rst b/news/9338.removal.rst
new file mode 100644
index 00000000000..6d3b666e53f
--- /dev/null
+++ b/news/9338.removal.rst
@@ -0,0 +1,2 @@
+Remove the VCS export feature that was used only with editable VCS
+requirements and had correctness issues.
diff --git a/news/9343.doc.rst b/news/9343.doc.rst
new file mode 100644
index 00000000000..1e4f91aec4c
--- /dev/null
+++ b/news/9343.doc.rst
@@ -0,0 +1 @@
+Fix broken email link in docs feedback banners.
diff --git a/news/9DE59242-2198-4760-B5A7-B5A6BB98ECA2.trivial.rst b/news/9DE59242-2198-4760-B5A7-B5A6BB98ECA2.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/a13640e3-bfd3-46ae-b4b6-bcb9784303b4.trivial.rst b/news/a13640e3-bfd3-46ae-b4b6-bcb9784303b4.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/a9950589-8b92-4ec1-a3a1-a6657cf6fd5b.trivial.rst b/news/a9950589-8b92-4ec1-a3a1-a6657cf6fd5b.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/ae7bdce7-d6f3-4f30-9192-6a8e69027d6a.trivial.rst b/news/ae7bdce7-d6f3-4f30-9192-6a8e69027d6a.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/b034ad46-e6b0-48b1-8b26-1145d611d082.trivial.rst b/news/b034ad46-e6b0-48b1-8b26-1145d611d082.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/b5e475d5-38b6-48cc-8136-0c32d3ace838.trivial.rst b/news/b5e475d5-38b6-48cc-8136-0c32d3ace838.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/bb86bc866fdc4257a445e0df09dd7e64.trivial.rst b/news/bb86bc866fdc4257a445e0df09dd7e64.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/d96bbdcd-059a-4ea4-b02e-343f8b51aad5.trivial.rst b/news/d96bbdcd-059a-4ea4-b02e-343f8b51aad5.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/dc9e5ecc-9fc9-4762-914e-34014e8d09bf.trivial.rst b/news/dc9e5ecc-9fc9-4762-914e-34014e8d09bf.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/ea24fc60-675c-4104-9825-39d1ee0a20b7.trivial.rst b/news/ea24fc60-675c-4104-9825-39d1ee0a20b7.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/f0af302f-aef7-4323-8332-819f0be13d79.trivial.rst b/news/f0af302f-aef7-4323-8332-819f0be13d79.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/f0b01f0a-f673-4c1b-9959-3196b6c000e9.trivial.rst b/news/f0b01f0a-f673-4c1b-9959-3196b6c000e9.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
new file mode 100644
index 00000000000..14a06e1c6bc
--- /dev/null
+++ b/news/msgpack.vendor.rst
@@ -0,0 +1 @@
+Upgrade msgpack to 1.0.2.
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
new file mode 100644
index 00000000000..9c9dee7b4a4
--- /dev/null
+++ b/news/requests.vendor.rst
@@ -0,0 +1 @@
+Upgrade requests to 2.25.1.
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 38ebba574c9..ae0fe9a9f24 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -4,7 +4,7 @@
from typing import List, Optional
-__version__ = "21.0"
+__version__ = "21.0.dev0"
def main(args=None):