Test against latest pypy2 and pypy3 only. No more 3.2

1 files changed, 6 insertions, 16 deletions

diff --git a/tox.ini b/tox.ini
index 900bdcd..c16dd0e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
 
 [tox]
-envlist = py{26,27,33,34,35,36}, pypy{40,54,3_24,3_52}, doc
+envlist = py{26,27,33,34,35,36}, pypy{2,3}, doc
 skip_missing_interpreters = True
 
 [testenv]
@@ -21,8 +21,6 @@ deps =
     py{27,33,34,35,36}: gevent==1.1.2
     py{26,27,33,34,35,36}: eventlet==0.19.0
     py{26,27,33,34,35,36}: greenlet==0.4.10
-    # setuptools no longer supports Python 3.2
-    pypy3_{24,52}: setuptools==21.1.0
 
 # Windows can't update the pip version with pip running, so use Python
 # to install things.
@@ -30,9 +28,7 @@ install_command = python -m pip install -U {opts} {packages}
 
 passenv = *
 setenv =
-    pypy,pypy{40,54,3_24,3_52}: COVERAGE_NO_EXTENSION=no C extension under PyPy
-    # Something (pip? setuptools?) chatters about 3.2 support going away.
-    pypy3_24: PYTHONWARNINGS=ignore:::pkg_resources
+    pypy,pypy{2,3}: COVERAGE_NO_EXTENSION=no C extension under PyPy
 
 commands =
     python setup.py --quiet clean develop
@@ -57,17 +53,11 @@ install_command = python -m pip.__main__ install -U {opts} {packages}
 # the other environments...
 basepython = pypy
 
-[testenv:pypy3_24]
-basepython = pypy3-2.4
+[testenv:pypy2]
+basepython = pypy2
 
-[testenv:pypy40]
-basepython = pypy4.0
-
-[testenv:pypy54]
-basepython = pypy5.4
-
-[testenv:pypy3_52]
-basepython = pypy3-5.2
+[testenv:pypy3]
+basepython = pypy3
 
 [testenv:doc]
 # Build the docs so we know if they are successful.  We build twice: once with