diff --git a/.travis.yml b/.travis.yml index 4b74e8d2..fbd95414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,8 @@ cache: pip matrix: include: - - python: 2.6 - env: TOXENV=py26 - dist: trusty - python: 2.7 env: TOXENV=py27 - - python: 3.3 - env: TOXENV=py33 - dist: trusty - sudo: false - python: 3.4 env: TOXENV=py34 - python: 3.5 @@ -26,10 +19,10 @@ matrix: sudo: required # required for Python 3.7 (travis-ci/travis-ci#9069) install: - - pip install tox==2.9.1 - - pip install virtualenv==15.2.0 - - pip install py==1.4.30 - - pip install pluggy==0.5.2 + - pip install tox==3.14.0 + - pip install virtualenv==16.7.5 + - pip install py==1.8.0 + - pip install pluggy==0.13.0 before_script: # Run flake8 tests only on Python 2.7 and 3.7... @@ -38,7 +31,7 @@ before_script: - if [[ $TRAVIS_PYTHON_VERSION == *.7 ]]; then pip install flake8; flake8 . --count --exit-zero --select=E901,E999,F821,F822,F823 --show-source --statistics; - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; fi script: diff --git a/setup.py b/setup.py index 11d694c2..5ae9165c 100755 --- a/setup.py +++ b/setup.py @@ -95,10 +95,8 @@ CLASSIFIERS = [ "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", @@ -175,7 +173,7 @@ packages=PACKAGES, package_data=PACKAGE_DATA, include_package_data=True, - python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*", + python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*", classifiers=CLASSIFIERS, **setup_kwds ) diff --git a/tox.ini b/tox.ini index f5c013f8..ec680a69 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] -envlist = py26,py27,py33,py34,py35,py36,py37 +envlist = py27,py34,py35,py36,py37 [testenv] deps = pytest unittest2 - py26: importlib commands = pytest {posargs}