summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst11
-rw-r--r--changelog.d/3009.misc.rst1
-rw-r--r--changelog.d/3031.misc.rst1
-rw-r--r--changelog.d/NNN.misc.rst0
-rw-r--r--setup.cfg2
6 files changed, 13 insertions, 4 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 04ab0a5d..6534cde9 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 60.5.3
+current_version = 60.5.4
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index e76ec3e9..e9f8a70f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v60.5.4
+-------
+
+
+Misc
+^^^^
+* #NNN:
+* #3009: Remove filtering of distutils warnings.
+* #3031: Suppress distutils replacement when building or testing CPython.
+
+
v60.5.3
-------
diff --git a/changelog.d/3009.misc.rst b/changelog.d/3009.misc.rst
deleted file mode 100644
index b2e2f9ef..00000000
--- a/changelog.d/3009.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove filtering of distutils warnings.
diff --git a/changelog.d/3031.misc.rst b/changelog.d/3031.misc.rst
deleted file mode 100644
index b5af0169..00000000
--- a/changelog.d/3031.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Suppress distutils replacement when building or testing CPython.
diff --git a/changelog.d/NNN.misc.rst b/changelog.d/NNN.misc.rst
deleted file mode 100644
index e69de29b..00000000
--- a/changelog.d/NNN.misc.rst
+++ /dev/null
diff --git a/setup.cfg b/setup.cfg
index eda747d8..b83d3763 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = setuptools
-version = 60.5.3
+version = 60.5.4
author = Python Packaging Authority
author_email = distutils-sig@python.org
description = Easily download, build, install, upgrade, and uninstall Python packages