summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMichael Merickel <mmerickel@users.noreply.github.com>2016-04-12 19:01:57 -0500
committerMichael Merickel <mmerickel@users.noreply.github.com>2016-04-12 19:01:57 -0500
commitefaf7300c9c3ef2a795aae7f724bf5b02e96cd75 (patch)
tree71d519b06340bb6bf7f686b4429a5d51235bf42f /tox.ini
parent73cd1e62745fddee602e95837f155ffd499e51b7 (diff)
parentccd9e10cb15fa7256feb47663eb994cd00dfe782 (diff)
downloadpyramid-efaf7300c9c3ef2a795aae7f724bf5b02e96cd75.tar.gz
pyramid-efaf7300c9c3ef2a795aae7f724bf5b02e96cd75.tar.bz2
pyramid-efaf7300c9c3ef2a795aae7f724bf5b02e96cd75.zip
Merge pull request #2467 from Pylons/remove.py26
Remove: py26
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 2 insertions, 9 deletions
diff --git a/tox.ini b/tox.ini
index 096600aec..d29f41662 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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