summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-12-23 19:30:24 -0500
committerJason R. Coombs <jaraco@jaraco.com>2021-12-23 19:30:24 -0500
commit247de8a2fbb2d1c34369ee83588100dbbe5f82a2 (patch)
treec237437de1b91e9ddc6189d27b1a5864908c2d4b
parent494d686474d90a9acc9fb0a3bffa54fd0202cf50 (diff)
downloadpython-setuptools-git-247de8a2fbb2d1c34369ee83588100dbbe5f82a2.tar.gz
Bump version: 60.0.5 → 60.1.0v60.1.0
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst10
-rw-r--r--changelog.d/2958.change.rst1
-rw-r--r--changelog.d/2963.change.rst1
-rw-r--r--setup.cfg2
5 files changed, 12 insertions, 4 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 65eec0b0..d5a104b0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 60.0.5
+current_version = 60.1.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index 998dda4e..09692544 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v60.1.0
+-------
+
+
+Changes
+^^^^^^^
+* #2958: In distutils_hack, only add the metadata finder once. In ensure_local_distutils, rely on a context manager for reliable manipulation.
+* #2963: Merge with pypa/distutils@a5af364910. Includes revisited fix for pypa/distutils#15 and improved MinGW/Cygwin support from pypa/distutils#77.
+
+
v60.0.5
-------
diff --git a/changelog.d/2958.change.rst b/changelog.d/2958.change.rst
deleted file mode 100644
index 9a3910e1..00000000
--- a/changelog.d/2958.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In distutils_hack, only add the metadata finder once. In ensure_local_distutils, rely on a context manager for reliable manipulation.
diff --git a/changelog.d/2963.change.rst b/changelog.d/2963.change.rst
deleted file mode 100644
index d4e2a112..00000000
--- a/changelog.d/2963.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Merge with pypa/distutils@a5af364910. Includes revisited fix for pypa/distutils#15 and improved MinGW/Cygwin support from pypa/distutils#77.
diff --git a/setup.cfg b/setup.cfg
index f1a6fc52..3daca1df 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = setuptools
-version = 60.0.5
+version = 60.1.0
author = Python Packaging Authority
author_email = distutils-sig@python.org
description = Easily download, build, install, upgrade, and uninstall Python packages