aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst12
-rw-r--r--changelog.d/1698.doc.rst1
-rw-r--r--changelog.d/2040.change.rst1
-rw-r--r--changelog.d/2062.change.rst1
-rw-r--r--changelog.d/2075.change.rst1
-rw-r--r--changelog.d/2082.misc.rst2
-rw-r--r--changelog.d/2086.change.rst1
-rw-r--r--setup.cfg2
9 files changed, 14 insertions, 9 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 00cbdc7a..c1b062e4 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 46.1.3
+current_version = 46.2.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index ac61c178..03c89be6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,15 @@
+v46.2.0
+-------
+
+* #2040: Deprecated the ``bdist_wininst`` command. Binary packages should be built as wheels instead.
+* #2062: Change 'Mac OS X' to 'macOS' in code.
+* #2075: Stop recognizing files ending with ``.dist-info`` as distribution metadata.
+* #2086: Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.
+* #1698: Added documentation for ``build_meta`` (a bare minimum, not completed).
+* #2082: Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in testes,
+ because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
+
+
v46.1.3
-------
diff --git a/changelog.d/1698.doc.rst b/changelog.d/1698.doc.rst
deleted file mode 100644
index 90dc14c1..00000000
--- a/changelog.d/1698.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation for ``build_meta`` (a bare minimum, not completed).
diff --git a/changelog.d/2040.change.rst b/changelog.d/2040.change.rst
deleted file mode 100644
index b8f36f6f..00000000
--- a/changelog.d/2040.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated the ``bdist_wininst`` command. Binary packages should be built as wheels instead.
diff --git a/changelog.d/2062.change.rst b/changelog.d/2062.change.rst
deleted file mode 100644
index 1f5fd812..00000000
--- a/changelog.d/2062.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Change 'Mac OS X' to 'macOS' in code.
diff --git a/changelog.d/2075.change.rst b/changelog.d/2075.change.rst
deleted file mode 100644
index abb13000..00000000
--- a/changelog.d/2075.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Stop recognizing files ending with ``.dist-info`` as distribution metadata.
diff --git a/changelog.d/2082.misc.rst b/changelog.d/2082.misc.rst
deleted file mode 100644
index 81ad5d58..00000000
--- a/changelog.d/2082.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in testes,
-because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
diff --git a/changelog.d/2086.change.rst b/changelog.d/2086.change.rst
deleted file mode 100644
index 9fa54e5a..00000000
--- a/changelog.d/2086.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.
diff --git a/setup.cfg b/setup.cfg
index 60838efc..2f5525f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
[metadata]
name = setuptools
-version = 46.1.3
+version = 46.2.0
description = Easily download, build, install, upgrade, and uninstall Python packages
author = Python Packaging Authority
author_email = distutils-sig@python.org