Bump version: 60.9.3 → 60.10.0v60.10.0

13 files changed, 38 insertions, 24 deletions

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 79260da6..fd32042d 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.9.3
+current_version = 60.10.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index a24cd2ad..3c724e47 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,39 @@
+v60.10.0
+--------
+
+
+Changes
+^^^^^^^
+* #2971: Deprecated upload_docs command, to be removed in the future.
+* #3137: Use samefile from stdlib, supported on Windows since Python 3.2.
+* #3170: Adopt nspektr (vendored) to implement Distribution._install_dependencies.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #3144: Added documentation on using console_scripts from setup.py, which was previously only shown in setup.cfg  -- by :user:`xhlulu`
+* #3148: Added clarifications about ``MANIFEST.in``, that include links to PyPUG docs
+  and more prominent mentions to using a revision control system plugin as an
+  alternative.
+* #3148: Removed mention to ``pkg_resources`` as the recommended way of accessing data
+  files, in favour of :doc:`importlib.resources`.
+  Additionally more emphasis was put on the fact that *package data files* reside
+  **inside** the *package directory* (and therefore should be *read-only*).
+
+Misc
+^^^^
+* #3120: Added workaround for intermittent failures of backend tests on PyPy.
+  These tests now are marked with `XFAIL
+  <https://docs.pytest.org/en/stable/how-to/skipping.html>`_, instead of erroring
+  out directly.
+* #3124: Improved configuration for :pypi:`rst-linker` (extension used to build the
+  changelog).
+* #3133: Enhanced isolation of tests using virtual environments - PYTHONPATH is not leaking to spawned subprocesses  -- by :user:`befeleme`
+* #3147: Added options to provide a pre-built ``setuptools`` wheel or sdist for being
+  used during tests with virtual environments.
+  Paths for these pre-built distribution files can now be set via the environment
+  variables: ``PRE_BUILT_SETUPTOOLS_SDIST`` and ``PRE_BUILT_SETUPTOOLS_WHEEL``.
+
+
 v60.9.3
 -------
 
diff --git a/changelog.d/2971.change.rst b/changelog.d/2971.change.rst
deleted file mode 100644
index b9a093b4..00000000
--- a/changelog.d/2971.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated upload_docs command, to be removed in the future.
diff --git a/changelog.d/3120.misc.rst b/changelog.d/3120.misc.rst
deleted file mode 100644
index 3531a0ab..00000000
--- a/changelog.d/3120.misc.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Added workaround for intermittent failures of backend tests on PyPy.
-These tests now are marked with `XFAIL
-<https://docs.pytest.org/en/stable/how-to/skipping.html>`_, instead of erroring
-out directly.
diff --git a/changelog.d/3124.misc.rst b/changelog.d/3124.misc.rst
deleted file mode 100644
index aba19b80..00000000
--- a/changelog.d/3124.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Improved configuration for :pypi:`rst-linker` (extension used to build the
-changelog).
diff --git a/changelog.d/3133.misc.rst b/changelog.d/3133.misc.rst
deleted file mode 100644
index 3377e061..00000000
--- a/changelog.d/3133.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Enhanced isolation of tests using virtual environments - PYTHONPATH is not leaking to spawned subprocesses  -- by :user:`befeleme`
diff --git a/changelog.d/3137.change.rst b/changelog.d/3137.change.rst
deleted file mode 100644
index e4186054..00000000
--- a/changelog.d/3137.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use samefile from stdlib, supported on Windows since Python 3.2.
diff --git a/changelog.d/3144.doc.rst b/changelog.d/3144.doc.rst
deleted file mode 100644
index 36cc6521..00000000
--- a/changelog.d/3144.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation on using console_scripts from setup.py, which was previously only shown in setup.cfg  -- by :user:`xhlulu`
\ No newline at end of file
diff --git a/changelog.d/3147.misc.rst b/changelog.d/3147.misc.rst
deleted file mode 100644
index 89556edd..00000000
--- a/changelog.d/3147.misc.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Added options to provide a pre-built ``setuptools`` wheel or sdist for being
-used during tests with virtual environments.
-Paths for these pre-built distribution files can now be set via the environment
-variables: ``PRE_BUILT_SETUPTOOLS_SDIST`` and ``PRE_BUILT_SETUPTOOLS_WHEEL``.
diff --git a/changelog.d/3148.doc.1.rst b/changelog.d/3148.doc.1.rst
deleted file mode 100644
index af89bde2..00000000
--- a/changelog.d/3148.doc.1.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Added clarifications about ``MANIFEST.in``, that include links to PyPUG docs
-and more prominent mentions to using a revision control system plugin as an
-alternative.
diff --git a/changelog.d/3148.doc.2.rst b/changelog.d/3148.doc.2.rst
deleted file mode 100644
index f46fb248..00000000
--- a/changelog.d/3148.doc.2.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Removed mention to ``pkg_resources`` as the recommended way of accessing data
-files, in favour of :doc:`importlib.resources`.
-Additionally more emphasis was put on the fact that *package data files* reside
-**inside** the *package directory* (and therefore should be *read-only*).
diff --git a/changelog.d/3170.change.rst b/changelog.d/3170.change.rst
deleted file mode 100644
index 8e356ca3..00000000
--- a/changelog.d/3170.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Adopt nspektr (vendored) to implement Distribution._install_dependencies.
diff --git a/setup.cfg b/setup.cfg
index 6171f624..58300194 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 60.9.3
+version = 60.10.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages