Bump version: 60.3.1 → 60.4.0v60.4.0

14 files changed, 44 insertions, 30 deletions

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index ca91c30e..57c38239 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.3.1
+current_version = 60.4.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 2c52ecfc..2f367678 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,45 @@
+v60.4.0
+-------
+
+
+Changes
+^^^^^^^
+* #2839: Removed `requires` sorting when installing wheels as an egg dir.
+* #2953: Fixed a bug that easy install incorrectly parsed Python 3.10 version string.
+* #3006: Fixed startup performance issue of Python interpreter due to imports of
+  costly modules in ``_distutils_hack`` -- by :user:`tiran`
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2674: Added link to additional resources on packaging in Quickstart guide
+* #3008: "In-tree" Sphinx extension for "favicons" replaced with ``sphinx-favicon``.
+* #3008: SVG images (logo, banners, ...) optimised with the help of the ``scour``
+  package.
+
+Misc
+^^^^
+* #2862: Added integration tests that focus on building and installing some packages in
+  the Python ecosystem via ``pip`` -- by :user:`abravalheri`
+* #2952: Modified "vendoring" logic to keep license files.
+* #2968: Improved isolation for some tests that where inadvertently using the project
+  root for builds, and therefore creating directories (e.g. ``build``, ``dist``,
+  ``*.egg-info``) that could interfere with the outcome of other tests
+  -- by :user:`abravalheri`.
+* #2968: Introduced new test fixtures ``venv``, ``venv_without_setuptools``,
+  ``bare_venv`` that rely on the ``jaraco.envs`` package.
+  These new test fixtures were also used to remove the (currently problematic)
+  dependency on the ``pytest_virtualenv`` plugin.
+* #2968: Removed ``tmp_src`` test fixture. Previously this fixture was copying all the
+  files and folders under the project root, including the ``.git`` directory,
+  which is error prone and increases testing time.
+
+  Since ``tmp_src`` was used to populate virtual environments (installing the
+  version of ``setuptools`` under test via the source tree), it was replaced by
+  the new ``setuptools_sdist`` and ``setuptools_wheel`` fixtures (that are build
+  only once per session testing and can be shared between all the workers for
+  read-only usage).
+
+
 v60.3.1
 -------
 
diff --git a/changelog.d/2674.doc.rst b/changelog.d/2674.doc.rst
deleted file mode 100644
index 3f0757a0..00000000
--- a/changelog.d/2674.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added link to additional resources on packaging in Quickstart guide
diff --git a/changelog.d/2839.change.rst b/changelog.d/2839.change.rst
deleted file mode 100644
index 621fa667..00000000
--- a/changelog.d/2839.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed `requires` sorting when installing wheels as an egg dir.
diff --git a/changelog.d/2862.misc.rst b/changelog.d/2862.misc.rst
deleted file mode 100644
index 77e80007..00000000
--- a/changelog.d/2862.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added integration tests that focus on building and installing some packages in
-the Python ecosystem via ``pip`` -- by :user:`abravalheri`
diff --git a/changelog.d/2952.misc.rst b/changelog.d/2952.misc.rst
deleted file mode 100644
index ccaf46b7..00000000
--- a/changelog.d/2952.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Modified "vendoring" logic to keep license files.
diff --git a/changelog.d/2953.change.rst b/changelog.d/2953.change.rst
deleted file mode 100644
index bc06b045..00000000
--- a/changelog.d/2953.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug that easy install incorrectly parsed Python 3.10 version string.
diff --git a/changelog.d/2968.misc.1.rst b/changelog.d/2968.misc.1.rst
deleted file mode 100644
index 502ba612..00000000
--- a/changelog.d/2968.misc.1.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Removed ``tmp_src`` test fixture. Previously this fixture was copying all the
-files and folders under the project root, including the ``.git`` directory,
-which is error prone and increases testing time.
-
-Since ``tmp_src`` was used to populate virtual environments (installing the
-version of ``setuptools`` under test via the source tree), it was replaced by
-the new ``setuptools_sdist`` and ``setuptools_wheel`` fixtures (that are build
-only once per session testing and can be shared between all the workers for
-read-only usage).
diff --git a/changelog.d/2968.misc.2.rst b/changelog.d/2968.misc.2.rst
deleted file mode 100644
index b575db13..00000000
--- a/changelog.d/2968.misc.2.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Introduced new test fixtures ``venv``, ``venv_without_setuptools``,
-``bare_venv`` that rely on the ``jaraco.envs`` package.
-These new test fixtures were also used to remove the (currently problematic)
-dependency on the ``pytest_virtualenv`` plugin.
diff --git a/changelog.d/2968.misc.3.rst b/changelog.d/2968.misc.3.rst
deleted file mode 100644
index 9b04c131..00000000
--- a/changelog.d/2968.misc.3.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Improved isolation for some tests that where inadvertently using the project
-root for builds, and therefore creating directories (e.g. ``build``, ``dist``,
-``*.egg-info``) that could interfere with the outcome of other tests
--- by :user:`abravalheri`.
diff --git a/changelog.d/3006.change.rst b/changelog.d/3006.change.rst
deleted file mode 100644
index d5f5d99d..00000000
--- a/changelog.d/3006.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed startup performance issue of Python interpreter due to imports of
-costly modules in ``_distutils_hack`` -- by :user:`tiran`
diff --git a/changelog.d/3008.doc.1.rst b/changelog.d/3008.doc.1.rst
deleted file mode 100644
index dbc09bae..00000000
--- a/changelog.d/3008.doc.1.rst
+++ /dev/null
@@ -1 +0,0 @@
-"In-tree" Sphinx extension for "favicons" replaced with ``sphinx-favicon``.
diff --git a/changelog.d/3008.doc.2.rst b/changelog.d/3008.doc.2.rst
deleted file mode 100644
index b094359c..00000000
--- a/changelog.d/3008.doc.2.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-SVG images (logo, banners, ...) optimised with the help of the ``scour``
-package.
diff --git a/setup.cfg b/setup.cfg
index 3bf0b618..20959166 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 60.3.1
+version = 60.4.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages