diff --git a/.travis.yml b/.travis.yml index cc9e0bcb9..29c5f8095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python matrix: include: - - python: "2.7" - python: "3.5" - python: "3.6" - python: "3.7" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d5bff336..eef4bb978 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on ## [Unreleased] +### Removed +- Python 2 support + ## [2.17] - 2020-02-02 This will be the last release with Python 2 support. This comes shortly after diff --git a/Jenkinsfile b/Jenkinsfile index 85fba8534..01a6e7aff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,6 @@ def pys = [ [name: 'Python 3.7', docker:'python:3.7-buster', tox:'py37', main: false], [name: 'Python 3.6', docker:'python:3.6-buster', tox:'py36', main: false], [name: 'Python 3.5', docker:'python:3.5-buster', tox:'py35', main: false], - [name: 'Python 2.7', docker:'python:2.7-buster', tox:'py27', main: false] ] properties([ diff --git a/README.md b/README.md index 0ea607c00..28c234708 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,8 @@ are old enough to view them. ### Dependencies Since dosage is written in [Python](http://www.python.org/), a Python -installation is required: for Python 2.x at least 2.7.0, for Python 3.x at -least Python 3.5. Dosage requires some Python modules from PyPI, so -installation with `pip` is recommended. +installation is required: Dosage needs at least Python 3.5. Dosage requires +some Python modules from PyPI, so installation with `pip` is recommended. ### Using the Windows binary diff --git a/requirements.txt b/requirements.txt index cb2644c82..504681be8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,5 @@ imagesize lxml requests>=2.0 six -backports.shutil_get_terminal_size; python_version<'3.3' -backports.functools_lru_cache; python_version<'3.2' cached_property; python_version<'3.8' importlib_metadata; python_version<'3.8' diff --git a/setup.cfg b/setup.cfg index cd6649a83..29aa9b2d1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,8 +18,6 @@ classifiers = Development Status :: 4 - Beta License :: OSI Approved :: MIT License Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 @@ -31,7 +29,7 @@ classifiers = setup_requires = setuptools >= 36.7.0 setuptools_scm -python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* +python_requires = >=3.5 packages = find: install_requires = colorama @@ -39,8 +37,6 @@ install_requires = lxml requests>=2.0 six - backports.shutil_get_terminal_size; python_version<'3.3' - backports.functools_lru_cache; python_version<'3.2' cached_property; python_version<'3.8' importlib_metadata; python_version<'3.8' diff --git a/tox.ini b/tox.ini index 9ec04d0fe..b41cb4a01 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, py36, py37, py38, flake8 +envlist = py35, py36, py37, py38, flake8 [testenv] commands = @@ -36,7 +36,7 @@ deps = max-line-length = 100 ignore = E127,E128,E241,FI12,FI14,FI15,FI50,FI51,FI53,FI54,FI55,W504 require-code = True -min-version = 2.7 +min-version = 3.5 # Duplicated for CodeClimate... [pep8]