diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-05-24 16:06:38 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-05-24 16:06:52 -0400 |
| commit | 64b1a6fa12f7d4f6508008541adbebdcd6ee20a8 (patch) | |
| tree | c1ba5043e8dcbc86e3a1a8b87cf88f0b8594a198 | |
| parent | 46dab46d6debf69331b646bff11052dc731d4ae4 (diff) | |
| download | external_python_setuptools-64b1a6fa12f7d4f6508008541adbebdcd6ee20a8.tar.gz external_python_setuptools-64b1a6fa12f7d4f6508008541adbebdcd6ee20a8.tar.bz2 external_python_setuptools-64b1a6fa12f7d4f6508008541adbebdcd6ee20a8.zip | |
Force fail on Python 2. When doing so, emit an error that directs users to the latest guidance. Fixes #2094.
| -rw-r--r-- | .github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md | 1 | ||||
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | pkg_resources/py2_warn.py | 19 |
3 files changed, 8 insertions, 17 deletions
diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md index e2d5ed53..b5fe8abf 100644 --- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md +++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md @@ -28,6 +28,7 @@ Your first course of action should be to reason about how you managed to get an <!-- These are the recommended workarounds for the issue. Please try them first. --> +- [ ] Read [Python 2 Sunset docs](https://setuptools.readthedocs.io/en/latest/python%202%20sunset.html). - [ ] Python 2 is required for this application. - [ ] I maintain the software that installs Setuptools (if not, please contact that project). - [ ] Setuptools installed with pip 9 or later. diff --git a/.travis.yml b/.travis.yml index 3e97f353..21716ea6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,6 @@ language: python jobs: fast_finish: true include: - - &latest_py2 - python: 2.7 - env: TOXENV=py27 - - <<: *latest_py2 - env: LANG=C TOXENV=py27 - python: pypy3 env: DISABLE_COVERAGE=1 # Don't run coverage on pypy (too slow). - python: 3.5 diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py index bfc35234..00cc8bc7 100644 --- a/pkg_resources/py2_warn.py +++ b/pkg_resources/py2_warn.py @@ -4,18 +4,13 @@ import textwrap msg = textwrap.dedent(""" - You are running Setuptools on Python 2, which is no longer - supported and - >>> SETUPTOOLS WILL STOP WORKING <<< - in a subsequent release (no sooner than 2020-04-20). - Please ensure you are installing - Setuptools using pip 9.x or later or pin to `setuptools<45` - in your environment. - If you have done those things and are still encountering - this message, please follow up at - https://bit.ly/setuptools-py2-warning. + Encountered a version of Setuptools that no longer supports + this version of Python. Please head to + https://bit.ly/setuptools-py2-warning for support. """) -pre = "Setuptools will stop working on Python 2\n" +pre = "Setuptools no longer works on Python 2\n" -sys.version_info < (3,) and warnings.warn(pre + "*" * 60 + msg + "*" * 60) +if sys.version_info < (3,): + warnings.warn(pre + "*" * 60 + msg + "*" * 60) + raise SystemExit(32) |