diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-09-07 20:18:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 20:18:57 -0400 |
| commit | 3b549e550cd2ece6a5c11fe0dcd73240c4dff706 (patch) | |
| tree | 6197b30d9c7e9cdab40853ba878acdd74acb0396 | |
| parent | b254ea77cd8328ab6e9fbe84db6718bcf6b014d4 (diff) | |
| parent | 00c0ef57a1aee9cd35623936e756292a21e8d684 (diff) | |
| download | python-setuptools-git-3b549e550cd2ece6a5c11fe0dcd73240c4dff706.tar.gz | |
Merge pull request #2777 from plumdog/do-not-error-if-use-2to3-is-false
Do not error if use_2to3 is set to a false value
| -rw-r--r-- | changelog.d/2777.misc.rst | 1 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | setuptools/dist.py | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/changelog.d/2777.misc.rst b/changelog.d/2777.misc.rst new file mode 100644 index 00000000..d001aeb6 --- /dev/null +++ b/changelog.d/2777.misc.rst @@ -0,0 +1 @@ +Build does not fail fast when ``use_2to3`` is supplied but set to a false value. @@ -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 3363495c..8e2111a5 100644 --- 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.") |