summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst15
-rw-r--r--changelog.d/3043.change.rst1
-rw-r--r--changelog.d/3054.misc.rst1
-rw-r--r--changelog.d/3057.change.rst1
-rw-r--r--changelog.d/3062.change.rst1
-rw-r--r--setup.cfg2
7 files changed, 17 insertions, 6 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 6534cde9..baf5b088 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 60.5.4
+current_version = 60.6.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index b6938ce7..a77f5395 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+v60.6.0
+-------
+
+
+Changes
+^^^^^^^
+* #3043: Merge with pypa/distutils@bb018f1ac3 including consolidated behavior in sysconfig.get_platform (pypa/distutils#104).
+* #3057: Don't include optional ``Home-page`` in metadata if no ``url`` is specified. -- by :user:`cdce8p`
+* #3062: Merge with pypa/distutils@b53a824ec3 including improved support for lib directories on non-x64 Windows builds.
+
+Misc
+^^^^
+* #3054: Used Py3 syntax ``super().__init__()`` -- by :user:`imba-tjd`
+
+
v60.5.4
-------
diff --git a/changelog.d/3043.change.rst b/changelog.d/3043.change.rst
deleted file mode 100644
index d52705f9..00000000
--- a/changelog.d/3043.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Merge with pypa/distutils@bb018f1ac3 including consolidated behavior in sysconfig.get_platform (pypa/distutils#104).
diff --git a/changelog.d/3054.misc.rst b/changelog.d/3054.misc.rst
deleted file mode 100644
index 7166f837..00000000
--- a/changelog.d/3054.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Used Py3 syntax ``super().__init__()`` -- by :user:`imba-tjd`
diff --git a/changelog.d/3057.change.rst b/changelog.d/3057.change.rst
deleted file mode 100644
index 1e18efc0..00000000
--- a/changelog.d/3057.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Don't include optional ``Home-page`` in metadata if no ``url`` is specified. -- by :user:`cdce8p`
diff --git a/changelog.d/3062.change.rst b/changelog.d/3062.change.rst
deleted file mode 100644
index cf3ff502..00000000
--- a/changelog.d/3062.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Merge with pypa/distutils@b53a824ec3 including improved support for lib directories on non-x64 Windows builds.
diff --git a/setup.cfg b/setup.cfg
index 0dc90438..957c7ad2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = setuptools
-version = 60.5.4
+version = 60.6.0
author = Python Packaging Authority
author_email = distutils-sig@python.org
description = Easily download, build, install, upgrade, and uninstall Python packages