From 80045ce11c74d1b50892d15feef82415e6badfe9 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 29 Dec 2021 15:34:39 -0500 Subject: [PATCH] =?UTF-8?q?Bump=20version:=2060.1.1=20=E2=86=92=2060.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGES.rst | 15 +++++++++++++++ changelog.d/2962.misc.rst | 1 - changelog.d/2974.change.rst | 1 - changelog.d/2983.misc.rst | 1 - changelog.d/2987.change.rst | 1 - setup.cfg | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) delete mode 100644 changelog.d/2962.misc.rst delete mode 100644 changelog.d/2974.change.rst delete mode 100644 changelog.d/2983.misc.rst delete mode 100644 changelog.d/2987.change.rst diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e607b2fcc8..f696b076be 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 60.1.1 +current_version = 60.2.0 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index 554ee73ed3..59b29fb51e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,18 @@ +v60.2.0 +------- + + +Changes +^^^^^^^ +* #2974: Setuptools now relies on the Python logging infrastructure to log messages. Instead of using ``distutils.log.*``, use ``logging.getLogger(name).*``. +* #2987: Sync with pypa/distutils@2def21c5d74fdd2fe7996ee4030ac145a9d751bd, including fix for missing get_versions attribute (#2969), more reliance on sysconfig from stdlib. + +Misc +^^^^ +* #2962: Avoid attempting to use local distutils when the presiding version of Setuptools on the path doesn't have one. +* #2983: Restore 'add_shim' as the way to invoke the hook. Avoids compatibility issues between different versions of Setuptools with the distutils local implementation. + + v60.1.1 ------- diff --git a/changelog.d/2962.misc.rst b/changelog.d/2962.misc.rst deleted file mode 100644 index 5a553a7729..0000000000 --- a/changelog.d/2962.misc.rst +++ /dev/null @@ -1 +0,0 @@ -Avoid attempting to use local distutils when the presiding version of Setuptools on the path doesn't have one. diff --git a/changelog.d/2974.change.rst b/changelog.d/2974.change.rst deleted file mode 100644 index fcfa00496d..0000000000 --- a/changelog.d/2974.change.rst +++ /dev/null @@ -1 +0,0 @@ -Setuptools now relies on the Python logging infrastructure to log messages. Instead of using ``distutils.log.*``, use ``logging.getLogger(name).*``. diff --git a/changelog.d/2983.misc.rst b/changelog.d/2983.misc.rst deleted file mode 100644 index cc11f757e9..0000000000 --- a/changelog.d/2983.misc.rst +++ /dev/null @@ -1 +0,0 @@ -Restore 'add_shim' as the way to invoke the hook. Avoids compatibility issues between different versions of Setuptools with the distutils local implementation. diff --git a/changelog.d/2987.change.rst b/changelog.d/2987.change.rst deleted file mode 100644 index 3b476eed0f..0000000000 --- a/changelog.d/2987.change.rst +++ /dev/null @@ -1 +0,0 @@ -Sync with pypa/distutils@2def21c5d74fdd2fe7996ee4030ac145a9d751bd, including fix for missing get_versions attribute (#2969), more reliance on sysconfig from stdlib. diff --git a/setup.cfg b/setup.cfg index 9ae3e02c18..75a41c8484 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = setuptools -version = 60.1.1 +version = 60.2.0 author = Python Packaging Authority author_email = distutils-sig@python.org description = Easily download, build, install, upgrade, and uninstall Python packages