Commit 6449c5b7 authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #1955 from pypa/drop-py2

Require Python 3.5 or later, dropping support for Python 2.
parents 70b3ec0b 79f1694b
...@@ -4,14 +4,8 @@ language: python ...@@ -4,14 +4,8 @@ language: python
jobs: jobs:
fast_finish: true fast_finish: true
include: include:
- &latest_py2
python: 2.7
- <<: *latest_py2
env: LANG=C
- python: pypy
env: DISABLE_COVERAGE=1 # Don't run coverage on pypy (too slow).
- python: pypy3 - python: pypy3
env: DISABLE_COVERAGE=1 env: DISABLE_COVERAGE=1 # Don't run coverage on pypy (too slow).
- python: 3.5 - python: 3.5
- python: 3.6 - python: 3.6
- python: 3.7 - python: 3.7
......
...@@ -9,8 +9,8 @@ environment: ...@@ -9,8 +9,8 @@ environment:
matrix: matrix:
- APPVEYOR_JOB_NAME: "python36-x64" - APPVEYOR_JOB_NAME: "python36-x64"
PYTHON: "C:\\Python36-x64" PYTHON: "C:\\Python36-x64"
- APPVEYOR_JOB_NAME: "python27-x64" - APPVEYOR_JOB_NAME: "python37-x64"
PYTHON: "C:\\Python27-x64" PYTHON: "C:\\Python37-x64"
install: install:
# symlink python from a directory with a space # symlink python from a directory with a space
......
Drop support for Python 2. Setuptools now requires Python 3.5 or later. Install setuptools using pip >=9 or pin to Setuptools <45 to maintain 2.7 support.
...@@ -83,6 +83,7 @@ __import__('pkg_resources.extern.packaging.version') ...@@ -83,6 +83,7 @@ __import__('pkg_resources.extern.packaging.version')
__import__('pkg_resources.extern.packaging.specifiers') __import__('pkg_resources.extern.packaging.specifiers')
__import__('pkg_resources.extern.packaging.requirements') __import__('pkg_resources.extern.packaging.requirements')
__import__('pkg_resources.extern.packaging.markers') __import__('pkg_resources.extern.packaging.markers')
__import__('pkg_resources.py2_warn')
__metaclass__ = type __metaclass__ = type
......
import sys
import warnings
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. 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 comment in
https://github.com/pypa/setuptools/issues/1458
about the steps that led to this unsupported combination.
""")
sys.version_info < (3,) and warnings.warn("*" * 60 + msg + "*" * 60)
...@@ -35,8 +35,6 @@ classifiers = ...@@ -35,8 +35,6 @@ classifiers =
Intended Audience :: Developers Intended Audience :: Developers
License :: OSI Approved :: MIT License License :: OSI Approved :: MIT License
Operating System :: OS Independent Operating System :: OS Independent
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
...@@ -49,7 +47,7 @@ classifiers = ...@@ -49,7 +47,7 @@ classifiers =
[options] [options]
zip_safe = True zip_safe = True
python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.* python_requires = >=3.5
py_modules = easy_install py_modules = easy_install
packages = find: packages = find:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment