From 2bea88ff771bc195029599d154c1bb9d0a02f2a2 Mon Sep 17 00:00:00 2001 From: Bastien Vallet Date: Tue, 26 May 2020 12:21:06 +0200 Subject: [PATCH] [compat] Drop support of py27 Python 2.7 is deprecated Drop support and remove six dependency --- .travis.yml | 2 -- AUTHORS.rst | 1 + requirements.txt | 2 +- setup.py | 15 +++------------ tox.ini | 2 +- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 761ebb9c..7e388739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python cache: pip python: - - 2.7 - - pypy - 3.5 - 3.6 - 3.7 diff --git a/AUTHORS.rst b/AUTHORS.rst index 30ae378d..01c19293 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -15,3 +15,4 @@ Patches and Suggestions - `Alex Ehlke `_ - `James Lu `_ - `Dan Elkis `_ +- `Bastien Vallet `_ diff --git a/requirements.txt b/requirements.txt index 8d24468b..3f3e5cbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ pytest-coverage coveralls mock pytest>=4.6 -maya; python_version == '2.7' or python_version >= '3.6' +maya; python_version >= '3.6' diff --git a/setup.py b/setup.py index 0e89c6bc..4123796e 100644 --- a/setup.py +++ b/setup.py @@ -2,15 +2,8 @@ from setuptools import setup -requires = [ - 'six', - 'python-dateutil>1.0,!=2.0; python_version<"3"', - 'python-dateutil>=2.7; python_version>="3"', -] -tests_require = [ - 'mock;python_version<"3.4"', - 'nose' -] +requires = ['python-dateutil>=2.7'] +tests_require = ['nose'] with open('README.rst') as f: readme = f.read() @@ -28,11 +21,9 @@ tests_require=tests_require, include_package_data=True, license='Apache 2.0', - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', + python_requires='>=3.5', classifiers=[ 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 0029d650..e5d0bbd6 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27, pypy, py35, py36, py37, py38, pypy3 +envlist = py35, py36, py37, py38, pypy3 [testenv] commands = make test NOSE_ARGS="{posargs}"