Skip to content

Commit afb1deb

Browse files
authored
Merge pull request #2770 from pypa/bugfix/2769-fail-fast-2to3
Fail fast when use_2to3 is supplied.
2 parents bbbe9c7 + 9f75850 commit afb1deb

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

changelog.d/2769.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Build now fails fast when ``use_2to3`` is supplied.

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ distutils.setup_keywords =
124124
dependency_links = setuptools.dist:assert_string_list
125125
test_loader = setuptools.dist:check_importable
126126
test_runner = setuptools.dist:check_importable
127+
use_2to3 = setuptools.dist:invalid
127128
egg_info.writers =
128129
PKG-INFO = setuptools.command.egg_info:write_pkg_info
129130
requires.txt = setuptools.command.egg_info:write_requirements

setuptools/dist.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ def assert_bool(dist, attr, value):
289289
raise DistutilsSetupError(tmpl.format(attr=attr, value=value))
290290

291291

292+
def invalid(dist, attr, value):
293+
raise DistutilsSetupError(f"{attr} is invalid.")
294+
295+
292296
def check_requirements(dist, attr, value):
293297
"""Verify that install_requires is a valid requirements list"""
294298
try:

0 commit comments

Comments
 (0)