summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst18
-rw-r--r--changelog.d/3678.misc.rst1
-rw-r--r--changelog.d/3684.misc.rst1
-rw-r--r--changelog.d/3689.doc.rst2
-rw-r--r--changelog.d/3690.misc.rst1
-rw-r--r--changelog.d/3693.misc.rst1
-rw-r--r--changelog.d/3704.misc.rst1
-rw-r--r--setup.cfg2
9 files changed, 20 insertions, 9 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 6a4b339c..d3921d9a 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 65.6.0
+current_version = 65.6.1
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index 5a24ff7a..52a87965 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+v65.6.1
+-------
+
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #3689: Document that ``distutils.cfg`` might be ignored unless
+ ``SETUPTOOLS_USE_DISTUTILS=stdlib``.
+
+Misc
+^^^^
+* #3678: Improve clib builds reproducibility by sorting sources -- by :user:`danigm`
+* #3684: Improved exception/traceback when invalid entry-points are specified.
+* #3690: Fixed logging errors: 'underlying buffer has been detached' (issue #1631).
+* #3693: Merge pypa/distutils@3e9d47e with compatibility fix for distutils.log.Log.
+* #3704: Fix temporary build directories interference with auto-discovery.
+
+
v65.6.0
-------
diff --git a/changelog.d/3678.misc.rst b/changelog.d/3678.misc.rst
deleted file mode 100644
index 89d796d7..00000000
--- a/changelog.d/3678.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve clib builds reproducibility by sorting sources -- by :user:`danigm`
diff --git a/changelog.d/3684.misc.rst b/changelog.d/3684.misc.rst
deleted file mode 100644
index d6b56e1a..00000000
--- a/changelog.d/3684.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improved exception/traceback when invalid entry-points are specified.
diff --git a/changelog.d/3689.doc.rst b/changelog.d/3689.doc.rst
deleted file mode 100644
index eb0fa05e..00000000
--- a/changelog.d/3689.doc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Document that ``distutils.cfg`` might be ignored unless
-``SETUPTOOLS_USE_DISTUTILS=stdlib``.
diff --git a/changelog.d/3690.misc.rst b/changelog.d/3690.misc.rst
deleted file mode 100644
index 388bd0b1..00000000
--- a/changelog.d/3690.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed logging errors: 'underlying buffer has been detached' (issue #1631).
diff --git a/changelog.d/3693.misc.rst b/changelog.d/3693.misc.rst
deleted file mode 100644
index 53f64ccf..00000000
--- a/changelog.d/3693.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Merge pypa/distutils@3e9d47e with compatibility fix for distutils.log.Log.
diff --git a/changelog.d/3704.misc.rst b/changelog.d/3704.misc.rst
deleted file mode 100644
index b0c2deaa..00000000
--- a/changelog.d/3704.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix temporary build directories interference with auto-discovery.
diff --git a/setup.cfg b/setup.cfg
index a34af39c..588d4a41 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = setuptools
-version = 65.6.0
+version = 65.6.1
author = Python Packaging Authority
author_email = distutils-sig@python.org
description = Easily download, build, install, upgrade, and uninstall Python packages