diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 93624e4c90..7f5864f86a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 60.9.0 +current_version = 60.9.1 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index dc1fac3433..efe34d3c7f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,14 @@ +v60.9.1 +------- + + +Misc +^^^^ +* #3102: Prevent vendored importlib_metadata from loading distributions from older importlib_metadata. +* #3103: Fixed issue where string-based entry points would be omitted. +* #3107: Bump importlib_metadata to 4.11.1 addressing issue with parsing requirements in egg-info as found in PyPy. + + v60.9.0 ------- diff --git a/changelog.d/3102.misc.rst b/changelog.d/3102.misc.rst deleted file mode 100644 index 2aa4d73a14..0000000000 --- a/changelog.d/3102.misc.rst +++ /dev/null @@ -1 +0,0 @@ -Prevent vendored importlib_metadata from loading distributions from older importlib_metadata. diff --git a/changelog.d/3103.misc.rst b/changelog.d/3103.misc.rst deleted file mode 100644 index 4e9f2b47dc..0000000000 --- a/changelog.d/3103.misc.rst +++ /dev/null @@ -1 +0,0 @@ -Fixed issue where string-based entry points would be omitted. diff --git a/changelog.d/3107.misc.rst b/changelog.d/3107.misc.rst deleted file mode 100644 index 6a7f776b07..0000000000 --- a/changelog.d/3107.misc.rst +++ /dev/null @@ -1 +0,0 @@ -Bump importlib_metadata to 4.11.1 addressing issue with parsing requirements in egg-info as found in PyPy. diff --git a/setup.cfg b/setup.cfg index 59999cc70b..555038c490 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = setuptools -version = 60.9.0 +version = 60.9.1 author = Python Packaging Authority author_email = distutils-sig@python.org description = Easily download, build, install, upgrade, and uninstall Python packages