diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-04-10 20:52:03 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-04-12 17:49:49 -0600 |
| commit | 4cd6cb4238f092baa19d477b1016c35af92b7b56 (patch) | |
| tree | 3fe7ba502207fd2bcd3638546734c6533ffc75de | |
| parent | 73cd1e62745fddee602e95837f155ffd499e51b7 (diff) | |
| download | pyramid-4cd6cb4238f092baa19d477b1016c35af92b7b56.tar.gz pyramid-4cd6cb4238f092baa19d477b1016c35af92b7b56.tar.bz2 pyramid-4cd6cb4238f092baa19d477b1016c35af92b7b56.zip | |
Remove Python 2.6 from all testing
This removes it from tox/travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 39f0ca435..e45f3df7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ sudo: false matrix: include: - - python: 2.6 - env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 - python: 3.3 @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py33,py34,py35,pypy,pypy3, + py27,py33,py34,py35,pypy,pypy3, docs,pep8, {py2,py3}-cover,coverage, @@ -8,7 +8,6 @@ envlist = # Most of these are defaults but if you specify any you can't fall back # to defaults for others. basepython = - py26: python2.6 py27: python2.7 py33: python3.3 py34: python3.4 @@ -22,14 +21,8 @@ commands = pip install pyramid[testing] nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} -[testenv:py26-scaffolds] -basepython = python2.6 -commands = - python pyramid/scaffolds/tests.py -deps = virtualenv - [testenv:py27-scaffolds] -basepython = python2.6 +basepython = python2.7 commands = python pyramid/scaffolds/tests.py deps = virtualenv |