summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst10
-rw-r--r--changelog.d/2355.change.rst1
-rw-r--r--changelog.d/2380.change.rst4
-rw-r--r--setup.cfg2
5 files changed, 12 insertions, 7 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 34b34fde..0bb91b48 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 50.1.0
+current_version = 50.2.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index a00d8271..9962f63d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v50.2.0
+-------
+
+* #2355: When pip is imported as part of a build, leave distutils patched.
+* #2380: There are some setuptools specific changes in the
+ `setuptools.command.bdist_rpm` module that are no longer needed, because
+ they are part of the `bdist_rpm` module in distutils in Python
+ 3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
+
+
v50.1.0
-------
diff --git a/changelog.d/2355.change.rst b/changelog.d/2355.change.rst
deleted file mode 100644
index d17435f5..00000000
--- a/changelog.d/2355.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-When pip is imported as part of a build, leave distutils patched.
diff --git a/changelog.d/2380.change.rst b/changelog.d/2380.change.rst
deleted file mode 100644
index e68d1080..00000000
--- a/changelog.d/2380.change.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-There are some setuptools specific changes in the
-`setuptools.command.bdist_rpm` module that are no longer needed, because
-they are part of the `bdist_rpm` module in distutils in Python
-3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`. \ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 692eb1fe..d35e5fa2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
[metadata]
name = setuptools
-version = 50.1.0
+version = 50.2.0
description = Easily download, build, install, upgrade, and uninstall Python packages
author = Python Packaging Authority
author_email = distutils-sig@python.org