diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-04-12 18:03:57 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-04-12 18:03:57 -0600 |
| commit | f3420699895969e825913da51dedfa5b880bc7d5 (patch) | |
| tree | 40bace55d7c03e53c490b465df2b5b27e024b1a6 /tox.ini | |
| parent | c8a9a4a279b7568657c5dc3e8f2ad8da31be5890 (diff) | |
| parent | efaf7300c9c3ef2a795aae7f724bf5b02e96cd75 (diff) | |
| download | pyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.gz pyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.bz2 pyramid-f3420699895969e825913da51dedfa5b880bc7d5.zip | |
Merge branch 'master' into feature/BeforeTraversal
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -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 |