Imported Upstream version 58.0.3

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2eb9496e8f6268f31794fc5399ac75ec6b7e3007..c95f09ebc60a28cb275dd29a8d4c76f66c2d426e 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 58.0.2
+current_version = 58.0.3
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index bf4ec6db075f1ad4182264321093c3ab037abc79..a919b310d69b294c443ee704aa4408de2e36e88b 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v58.0.3
+-------
+
+
+Misc
+^^^^
+* #2777: Build does not fail fast when ``use_2to3`` is supplied but set to a false value.
+
+
 v58.0.2
 -------
 

diff --git a/setup.cfg b/setup.cfg
index 92f8616068abc521608314b613a74f28ff388778..fbf82af10e3ed89c28ad026fb1206391b3b79179 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 58.0.2
+version = 58.0.3
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages
@@ -124,7 +124,7 @@ distutils.setup_keywords =
        dependency_links = setuptools.dist:assert_string_list
        test_loader = setuptools.dist:check_importable
        test_runner = setuptools.dist:check_importable
-       use_2to3 = setuptools.dist:invalid
+       use_2to3 = setuptools.dist:invalid_unless_false
 egg_info.writers =
        PKG-INFO = setuptools.command.egg_info:write_pkg_info
        requires.txt = setuptools.command.egg_info:write_requirements

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 3363495c91b67f099767fb4ed99d63bb5650e657..8e2111a52ba7d5dc2a361d03303d93261c25abd5 100644 (file)
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -289,7 +289,10 @@ def assert_bool(dist, attr, value):
         raise DistutilsSetupError(tmpl.format(attr=attr, value=value))
 
 
-def invalid(dist, attr, value):
+def invalid_unless_false(dist, attr, value):
+    if not value:
+        warnings.warn(f"{attr} is ignored.", DistDeprecationWarning)
+        return
     raise DistutilsSetupError(f"{attr} is invalid.")