summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini6
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 36bf5d77..be931e7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,4 @@ script:
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e py27; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then tox -e py33; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then tox -e py34; fi
- - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then tox -e pypy25; fi
+ - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then tox -e pypy; fi
diff --git a/tox.ini b/tox.ini
index a29724c5..93359990 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,12 +37,12 @@ setenv =
usedevelop = True
passenv = *
+[testenv:pypy]
+basepython = pypy
+
[testenv:pypy24]
basepython = pypy2.4
-[testenv:pypy25]
-basepython = pypy2.5
-
[testenv:pypy26]
basepython = pypy2.6