Merge tag 'v46.1.2'

jaraco · jaraco · commit e5a8bfedcba9 · 2020-03-25T11:06:29.000-04:00
Bump version: 46.1.1 → 46.1.2
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.1.1
+current_version = 46.1.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+v46.1.2
+-------
+
+* #1458: Added template for reporting Python 2 incompatibilities.
+
+
 v46.1.1
 -------
 
diff --git a/changelog.d/1458.misc.rst b/changelog.d/1458.misc.rst
diff --git a/setup.cfg b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.1.1
+version = 46.1.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +v46.1.2
 +-------
++
 +* #1458: Added template for reporting Python 2 incompatibilities.
++
++
 v46.1.1
 -------