Bump version: 39.2.0 → 40.0.0v40.0.0

10 files changed, 13 insertions, 9 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index d52ed48f..2f96af99 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v40.0.0
+-------
+* #1342: Drop support for Python 3.3.
+* #1366: In package_index, fixed handling of encoded entities in URLs.
+* #1383: In pkg_resources VendorImporter, avoid removing packages imported from the root.
+* #1379: Minor doc fixes after actually using the new release process.
+* #1385: Removed section on non-package data files.
+* #1403: Fix developer's guide.
+* #1404: Fix PEP 518 configuration: set build requirements in ``pyproject.toml`` to ``["wheel"]``.
+
+
 v39.2.0
 -------
 
diff --git a/changelog.d/1342.breaking.rst b/changelog.d/1342.breaking.rst
deleted file mode 100644
index 9756e313..00000000
--- a/changelog.d/1342.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for Python 3.3.
diff --git a/changelog.d/1366.change.rst b/changelog.d/1366.change.rst
deleted file mode 100644
index f70e2a2e..00000000
--- a/changelog.d/1366.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In package_index, fixed handling of encoded entities in URLs.
diff --git a/changelog.d/1379.doc.rst b/changelog.d/1379.doc.rst
deleted file mode 100644
index ca017719..00000000
--- a/changelog.d/1379.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Minor doc fixes after actually using the new release process.
diff --git a/changelog.d/1383.change b/changelog.d/1383.change
deleted file mode 100644
index dc8b839b..00000000
--- a/changelog.d/1383.change
+++ /dev/null
@@ -1 +0,0 @@
-In pkg_resources VendorImporter, avoid removing packages imported from the root.
diff --git a/changelog.d/1385.doc.rst b/changelog.d/1385.doc.rst
deleted file mode 100644
index 7bd88e8f..00000000
--- a/changelog.d/1385.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed section on non-package data files.
diff --git a/changelog.d/1403.doc.rst b/changelog.d/1403.doc.rst
deleted file mode 100644
index 1a636085..00000000
--- a/changelog.d/1403.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix developer's guide.
diff --git a/changelog.d/1404.misc.rst b/changelog.d/1404.misc.rst
deleted file mode 100644
index 2d4bd629..00000000
--- a/changelog.d/1404.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix PEP 518 configuration: set build requirements in ``pyproject.toml`` to ``["wheel"]``.
diff --git a/setup.cfg b/setup.cfg
index e23ee6f0..2caeca9b 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 39.2.0
+current_version = 40.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 22c26dd2..27a0e30e 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="39.2.0",
+    version="40.0.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"