summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bumpversion.cfg2
-rw-r--r--CHANGES.rst7
-rw-r--r--changelog.d/2232.breaking.rst1
-rw-r--r--changelog.d/2334.change.rst1
-rw-r--r--setup.cfg2
5 files changed, 9 insertions, 4 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4bbe60c4..a50c3bad 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 49.6.0
+current_version = 50.0.0
commit = True
tag = True
diff --git a/CHANGES.rst b/CHANGES.rst
index 2d49707b..9dd77e12 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v50.0.0
+-------
+
+* #2232: Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
+* #2334: In MSVC module, refine text in error message.
+
+
v49.6.0
-------
diff --git a/changelog.d/2232.breaking.rst b/changelog.d/2232.breaking.rst
deleted file mode 100644
index b2fd926f..00000000
--- a/changelog.d/2232.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
diff --git a/changelog.d/2334.change.rst b/changelog.d/2334.change.rst
deleted file mode 100644
index 9d3c7440..00000000
--- a/changelog.d/2334.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In MSVC module, refine text in error message.
diff --git a/setup.cfg b/setup.cfg
index b058fa86..577e23c1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
[metadata]
name = setuptools
-version = 49.6.0
+version = 50.0.0
description = Easily download, build, install, upgrade, and uninstall Python packages
author = Python Packaging Authority
author_email = distutils-sig@python.org