diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | pylint/__pkginfo__.py | 26 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 2 insertions, 32 deletions
diff --git a/.travis.yml b/.travis.yml index e9292e1cf..44856681c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ language: python # 3.5-dev because of http://bugs.python.org/issue25131 matrix: include: - - python: 2.7 - env: TOXENV=py27 - - python: 2.7.6 - env: TOXENV=py27 - python: 3.4 env: TOXENV=py34 - python: 3.5-dev diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py index 68a03065b..c72dfc5bd 100644 --- a/pylint/__pkginfo__.py +++ b/pylint/__pkginfo__.py @@ -20,10 +20,6 @@ from __future__ import absolute_import from os.path import join -from sys import version_info as py_version - -from pkg_resources import parse_version -from setuptools import __version__ as setuptools_version modname = distname = 'pylint' @@ -42,26 +38,6 @@ dependency_links = [] extras_require = {} extras_require[':sys_platform=="win32"'] = ['colorama'] - -def has_environment_marker_range_operators_support(): - """Code extracted from 'pytest/setup.py' - https://github.com/pytest-dev/pytest/blob/7538680c/setup.py#L31 - The first known release to support environment marker with range operators - it is 17.1, see: https://setuptools.readthedocs.io/en/latest/history.html#id113 - """ - return parse_version(setuptools_version) >= parse_version('17.1') - - -if has_environment_marker_range_operators_support(): - extras_require[':python_version=="2.7"'] = ['configparser', 'backports.functools_lru_cache'] - extras_require[':python_version<"3.4"'] = ['singledispatch'] -else: - if (py_version.major, py_version.minor) == (2, 7): - install_requires.extend(['configparser', 'backports.functools_lru_cache']) - if py_version < (3, 4): - install_requires.extend(['singledispatch']) - - license = 'GPL' description = "python code static checker" web = 'https://github.com/PyCQA/pylint' @@ -75,8 +51,6 @@ classifiers = ['Development Status :: 4 - Beta', 'License :: OSI Approved :: GNU General Public License (GPL)', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', @@ -169,7 +169,7 @@ def install(**kwargs): cmdclass=cmdclass, extras_require=extras_require, test_suite='test', - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + python_requires='>=3.4.*', setup_requires=['pytest-runner'], tests_require=['pytest'], **kwargs) @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, py36, pypy, pylint +envlist = py34, py35, py36, pypy, pylint skip_missing_interpreters = true [testenv:pylint] |