aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-03-25 11:06:29 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-03-25 11:06:29 -0400
commite5a8bfedcba9e4971b0d11adc0e37f69b8e69a92 (patch)
treec9279d858f79391d81da8e315fc16f0702f062e2
parent7355cce542963d9a83c7c754dc63a0c7e68bf3aa (diff)
parentdb08c60c303d64459dae479af84e3cd1cd02ba1d (diff)
downloadexternal_python_setuptools-e5a8bfedcba9e4971b0d11adc0e37f69b8e69a92.tar.gz
external_python_setuptools-e5a8bfedcba9e4971b0d11adc0e37f69b8e69a92.tar.bz2
external_python_setuptools-e5a8bfedcba9e4971b0d11adc0e37f69b8e69a92.zip
Merge tag 'v46.1.2'
Bump version: 46.1.1 → 46.1.2
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst6
-rw-r--r--changelog.d/1458.misc.rst1
-rw-r--r--setup.cfg2
4 files changed, 8 insertions, 3 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 03fe7b43..4a54253c 100644
--- 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
index 1edbd12a..672355af 100644
--- 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
deleted file mode 100644
index 6a8e58a3..00000000
--- a/changelog.d/1458.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added template for reporting Python 2 incompatibilities.
diff --git a/setup.cfg b/setup.cfg
index 14426181..8347dede 100644
--- 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