Merge branch '40.7-maintenance'

4 files changed, 8 insertions, 3 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 79ebe165..7d1353b4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.7.2
+-------
+
+* #1666: Restore port in URL handling in package_index.
+
+
 v40.7.1
 -------
 
diff --git a/changelog.d/1665.change.rst b/changelog.d/1665.change.rst
deleted file mode 100644
index 55a1c0f1..00000000
--- a/changelog.d/1665.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore port in URL handling in package_index.
diff --git a/setup.cfg b/setup.cfg
index c934e2f4..16db1221 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.7.1
+current_version = 40.7.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9e50513b..a009f179 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.7.1",
+    version="40.7.2",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"