summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst7
-rw-r--r--changelog.d/1700.change.rst1
-rw-r--r--changelog.d/2094.breaking.rst1
-rw-r--r--setup.cfg2
5 files changed, 9 insertions, 4 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 72d02f2b..2639380e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 46.4.0
+current_version = 47.0.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index ea667028..db1c67f7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v47.0.0
+-------
+
+* #2094: Setuptools now actively crashes under Python 2. Python 3.5 or later is required. Users of Python 2 should use ``setuptools<45``.
+* #1700: Document all supported keywords by migrating the ones from distutils.
+
+
v46.4.0
-------
diff --git a/changelog.d/1700.change.rst b/changelog.d/1700.change.rst
deleted file mode 100644
index f66046a2..00000000
--- a/changelog.d/1700.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Document all supported keywords by migrating the ones from distutils.
diff --git a/changelog.d/2094.breaking.rst b/changelog.d/2094.breaking.rst
deleted file mode 100644
index c278d0fd..00000000
--- a/changelog.d/2094.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools now actively crashes under Python 2. Python 3.5 or later is required. Users of Python 2 should use ``setuptools<45``.
diff --git a/setup.cfg b/setup.cfg
index 72d4dce9..ed31c450 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
[metadata]
name = setuptools
-version = 46.4.0
+version = 47.0.0
description = Easily download, build, install, upgrade, and uninstall Python packages
author = Python Packaging Authority
author_email = distutils-sig@python.org