17 files changed, 28 insertions, 22 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index d8b5b491..d3d661cc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,29 @@
+v39.2.0
+-------
+
+* #1359: Support using "file:" to load a PEP 440-compliant package version from
+  a text file.
+* #1360: Fixed issue with a mismatch between the name of the package and the
+  name of the .dist-info file in wheel files
+* #1365: Take the package_dir option into account when loading the version from
+  a module attribute.
+* #1353: Added coverage badge to README.
+* #1356: Made small fixes to the developer guide documentation.
+* #1357: Fixed warnings in documentation builds and started enforcing that the
+  docs build without warnings in tox.
+* #1376: Updated release process docs.
+* #1343: The ``setuptools`` specific ``long_description_content_type``,
+  ``project_urls`` and ``provides_extras`` fields are now set consistently
+  after any ``distutils`` ``setup_keywords`` calls, allowing them to override
+  values.
+* #1352: Added ``tox`` environment for documentation builds.
+* #1354: Added ``towncrier`` for changelog managment.
+* #1355: Add PR template.
+* #1368: Fixed tests which failed without network connectivity.
+* #1369: Added unit tests for PEP 425 compatibility tags support.
+* #1372: Stop testing Python 3.3 in Travis CI, now that the latest version of
+  ``wheel`` no longer installs on it.
+
 v39.1.0
 -------
 
diff --git a/changelog.d/1343.misc.rst b/changelog.d/1343.misc.rst
deleted file mode 100644
index 644320f4..00000000
--- a/changelog.d/1343.misc.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The ``setuptools`` specific ``long_description_content_type``,
-``project_urls`` and ``provides_extras`` fields are now set
-consistently after any ``distutils`` ``setup_keywords`` calls,
-allowing them to override values.
diff --git a/changelog.d/1352.misc.rst b/changelog.d/1352.misc.rst
deleted file mode 100644
index 331ce47b..00000000
--- a/changelog.d/1352.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``tox`` environment for documentation builds.
diff --git a/changelog.d/1353.doc.rst b/changelog.d/1353.doc.rst
deleted file mode 100644
index f23fec8f..00000000
--- a/changelog.d/1353.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added coverage badge to README.
diff --git a/changelog.d/1354.misc.rst b/changelog.d/1354.misc.rst
deleted file mode 100644
index 7f9b80c9..00000000
--- a/changelog.d/1354.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``towncrier`` for changelog managment.
diff --git a/changelog.d/1355.misc.rst b/changelog.d/1355.misc.rst
deleted file mode 100644
index af1e3f3f..00000000
--- a/changelog.d/1355.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add PR template.
diff --git a/changelog.d/1356.doc.rst b/changelog.d/1356.doc.rst
deleted file mode 100644
index 7ea0e830..00000000
--- a/changelog.d/1356.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Made small fixes to the developer guide documentation.
diff --git a/changelog.d/1357.doc.rst b/changelog.d/1357.doc.rst
deleted file mode 100644
index 11d97cc7..00000000
--- a/changelog.d/1357.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed warnings in documentation builds and started enforcing that the docs build without warnings in tox.
diff --git a/changelog.d/1359.change.rst b/changelog.d/1359.change.rst
deleted file mode 100644
index 05746e73..00000000
--- a/changelog.d/1359.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Support using "file:" to load a PEP 440-compliant package version
-from a text file.
diff --git a/changelog.d/1360.change.rst b/changelog.d/1360.change.rst
deleted file mode 100644
index 36f40483..00000000
--- a/changelog.d/1360.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed issue with a mismatch between the name of the package and the name of the .dist-info file in wheel files
diff --git a/changelog.d/1365.change.rst b/changelog.d/1365.change.rst
deleted file mode 100644
index 63eb008b..00000000
--- a/changelog.d/1365.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Take the package_dir option into account when loading the version from a
-module attribute.
diff --git a/changelog.d/1368.misc.rst b/changelog.d/1368.misc.rst
deleted file mode 100644
index 289e6a68..00000000
--- a/changelog.d/1368.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed tests which failed without network connectivity.
diff --git a/changelog.d/1369.misc.rst b/changelog.d/1369.misc.rst
deleted file mode 100644
index d1803f23..00000000
--- a/changelog.d/1369.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added unit tests for PEP 425 compatibility tags support.
diff --git a/changelog.d/1372.misc.rst b/changelog.d/1372.misc.rst
deleted file mode 100644
index d1bc789b..00000000
--- a/changelog.d/1372.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Stop testing Python 3.3 in Travis CI, now that the latest version of
-``wheel`` no longer installs on it.
diff --git a/changelog.d/1376.doc.rst b/changelog.d/1376.doc.rst
deleted file mode 100644
index c2dcacda..00000000
--- a/changelog.d/1376.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated release process docs.
diff --git a/setup.cfg b/setup.cfg
index 2c84f0b7..e23ee6f0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 39.1.0
+current_version = 39.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b08552d4..b122df82 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="39.1.0",
+    version="39.2.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"