Bump version: 41.6.0 → 42.0.0v42.0.0

10 files changed, 22 insertions, 24 deletions

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 40db5b03..0551f1b0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.6.0
+current_version = 42.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ba7b4647..0a8696c2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+v42.0.0
+-------
+
+* #1830, #1909: Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
+   * support for ``python_requires``
+   * better support for wheels (proper handling of priority with respect to PEP 425 tags)
+   * PEP 517/518 support
+   * eggs are not supported
+   * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
+   * pip environment variables are honored (and take precedence over easy_install options)
+* #1898: Removed the "upload" and "register" commands in favor of `twine <https://pypi.org/p/twine>`_.
+* #1767: Add support for the ``license_files`` option in ``setup.cfg`` to automatically
+  include multiple license files in a source distribution.
+* #1829: Update handling of wheels compatibility tags:
+  * add support for manylinux2010
+  * fix use of removed 'm' ABI flag in Python 3.8 on Windows
+* #1861: Fix empty namespace package installation from wheel.
+* #1877: Setuptools now exposes a new entry point hook "setuptools.finalize_distribution_options", enabling plugins like `setuptools_scm <https://pypi.org/project/setuptools_scm>`_ to configure options on the distribution at finalization time.
+
+
 v41.6.0
 -------
 
diff --git a/changelog.d/1767.change.rst b/changelog.d/1767.change.rst
deleted file mode 100644
index 5d42aedc..00000000
--- a/changelog.d/1767.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for the ``license_files`` option in ``setup.cfg`` to automatically
-include multiple license files in a source distribution.
diff --git a/changelog.d/1829.change.rst b/changelog.d/1829.change.rst
deleted file mode 100644
index 36be832a..00000000
--- a/changelog.d/1829.change.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update handling of wheels compatibility tags:
-* add support for manylinux2010
-* fix use of removed 'm' ABI flag in Python 3.8 on Windows
diff --git a/changelog.d/1830.breaking.rst b/changelog.d/1830.breaking.rst
deleted file mode 100644
index 9f2214ab..00000000
--- a/changelog.d/1830.breaking.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
- * support for ``python_requires``
- * better support for wheels (proper handling of priority with respect to PEP 425 tags)
- * PEP 517/518 support
- * eggs are not supported
- * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
- * pip environment variables are honored (and take precedence over easy_install options)
diff --git a/changelog.d/1861.change.rst b/changelog.d/1861.change.rst
deleted file mode 100644
index 5a4e0a56..00000000
--- a/changelog.d/1861.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix empty namespace package installation from wheel.
diff --git a/changelog.d/1877.change.rst b/changelog.d/1877.change.rst
deleted file mode 100644
index 5a744fa3..00000000
--- a/changelog.d/1877.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools now exposes a new entry point hook "setuptools.finalize_distribution_options", enabling plugins like `setuptools_scm <https://pypi.org/project/setuptools_scm>`_ to configure options on the distribution at finalization time.
diff --git a/changelog.d/1898.breaking.rst b/changelog.d/1898.breaking.rst
deleted file mode 100644
index 844a8a42..00000000
--- a/changelog.d/1898.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed the "upload" and "register" commands in favor of `twine <https://pypi.org/p/twine>`_.
diff --git a/changelog.d/1909.breaking.rst b/changelog.d/1909.breaking.rst
deleted file mode 100644
index 9f2214ab..00000000
--- a/changelog.d/1909.breaking.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
- * support for ``python_requires``
- * better support for wheels (proper handling of priority with respect to PEP 425 tags)
- * PEP 517/518 support
- * eggs are not supported
- * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
- * pip environment variables are honored (and take precedence over easy_install options)
diff --git a/setup.cfg b/setup.cfg
index 42a3d86c..c0aa35ba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.6.0
+version = 42.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org