diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
| commit | fc4d9828768ceebd2f9337481450c88376c013e9 (patch) | |
| tree | 6dff622c50739ca19fdfbecf1008a42589d37b57 /setuptools/tests/__init__.py | |
| parent | 7bb73a477de24069002516eb6eb1d755bed9d65b (diff) | |
| parent | 03d36b9edb53e266a0b4b836e1e3178f989a0781 (diff) | |
| download | python-setuptools-git-feature/implicit-bootstrap.tar.gz | |
Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap
Diffstat (limited to 'setuptools/tests/__init__.py')
| -rw-r--r-- | setuptools/tests/__init__.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index 9c77b51f..a7a2112f 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -2,17 +2,12 @@ import locale import pytest -from setuptools.extern.six import PY2, PY3 - -__all__ = [ - 'fail_on_ascii', 'py2_only', 'py3_only' -] +__all__ = ['fail_on_ascii', 'ack_2to3'] is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968' fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale") -py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only") -py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only") +ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated') |