diff --git a/.travis.yml b/.travis.yml index 934ee2a24..46b14fe63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,7 @@ env: - GOPATH=/tmp/go - PATH=$GOPATH/bin:$PATH matrix: - - TOXENV=py26 BOULDER_INTEGRATION=1 - TOXENV=py27 BOULDER_INTEGRATION=1 - - TOXENV=py33 - - TOXENV=py34 - TOXENV=lint - TOXENV=cover diff --git a/setup.py b/setup.py index e72d7b231..6e1640e3e 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,6 @@ setup( 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Security', diff --git a/tox.ini b/tox.ini index 83a3d07ec..2b2466c3b 100644 --- a/tox.ini +++ b/tox.ini @@ -40,7 +40,6 @@ commands = ./tox.cover.sh [testenv:lint] -# recent versions of pylint do not support Python 2.6 (#97, #187) basepython = python2.7 # separating into multiple invocations disables cross package # duplicate code checking; if one of the commands fails, others will