From 247de8a2fbb2d1c34369ee83588100dbbe5f82a2 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 23 Dec 2021 19:30:24 -0500 Subject: [PATCH] =?UTF-8?q?Bump=20version:=2060.0.5=20=E2=86=92=2060.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGES.rst | 10 ++++++++++ changelog.d/2958.change.rst | 1 - changelog.d/2963.change.rst | 1 - setup.cfg | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/2958.change.rst delete mode 100644 changelog.d/2963.change.rst diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 65eec0b030..d5a104b059 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 998dda4e58..096925441f 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 9a3910e157..0000000000 --- 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 d4e2a112d3..0000000000 --- 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 f1a6fc5278..3daca1df8d 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