Support multiple versions of pypy (#19) (#843)

As with cpython, we can now support pypy2, pypy27 etc.

Closes: #19

Author: stephenfin

changelog/19.feature.rst

@@ -0,0 +1,3 @@
+Add support for multiple PyPy versions using default factors. This allows you
+to use, for example, ``pypy27`` knowing that the correct intepreter will be
+used by default - by @stephenfin

tests/test_config.py

@@ -1817,12 +1817,16 @@ def test_correct_basepython_chosen_from_default_factors(self, newconfig):
             basepython = config.envconfigs[name].basepython
             if name == "jython":
                 assert basepython == "jython"
-            elif name.startswith("pypy"):
-                assert basepython == name
+            elif name in ("pypy2", "pypy3"):
+                assert basepython == "pypy" + name[-1]
             elif name in ("py2", "py3"):
                 assert basepython == "python" + name[-1]
+            elif name == "pypy":
+                assert basepython == name
             elif name == "py":
                 assert "python" in basepython or "pypy" in basepython
+            elif "pypy" in name:
+                assert basepython == "pypy{}.{}".format(name[-2], name[-1])
             else:
                 assert name.startswith("py")
                 assert basepython == "python{}.{}".format(name[2], name[3])
@@ -2341,10 +2345,10 @@ def test_listenvs(self, cmd, initproj):
             filedefs={
                 "tox.ini": """
             [tox]
-            envlist=py36,py27,py34,pypy,docs
+            envlist=py36,py27,py34,pypi,docs
             description= py27: run pytest on Python 2.7
                          py34: run pytest on Python 3.6
-                         pypy: publish to pypy
+                         pypi: publish to PyPI
                          docs: document stuff
                          notincluded: random extra
 
@@ -2357,20 +2361,20 @@ def test_listenvs(self, cmd, initproj):
             },
         )
         result = cmd("-l")
-        assert result.outlines == ["py36", "py27", "py34", "pypy", "docs"]
+        assert result.outlines == ["py36", "py27", "py34", "pypi", "docs"]
 
     def test_listenvs_verbose_description(self, cmd, initproj):
         initproj(
             "listenvs_verbose_description",
             filedefs={
                 "tox.ini": """
             [tox]
-            envlist=py36,py27,py34,pypy,docs
+            envlist=py36,py27,py34,pypi,docs
             [testenv]
             description= py36: run pytest on Python 3.6
                          py27: run pytest on Python 2.7
                          py34: run pytest on Python 3.4
-                         pypy: publish to pypy
+                         pypi: publish to PyPI
                          docs: document stuff
                          notincluded: random extra
 
@@ -2389,7 +2393,7 @@ def test_listenvs_verbose_description(self, cmd, initproj):
             "py36 -> run pytest on Python 3.6",
             "py27 -> run pytest on Python 2.7",
             "py34 -> run pytest on Python 3.4",
-            "pypy -> publish to pypy",
+            "pypi -> publish to PyPI",
             "docs -> let me overwrite that",
         ]
         assert result.outlines[2:] == expected
@@ -2400,7 +2404,7 @@ def test_listenvs_all(self, cmd, initproj):
             filedefs={
                 "tox.ini": """
             [tox]
-            envlist=py36,py27,py34,pypy,docs
+            envlist=py36,py27,py34,pypi,docs
 
             [testenv:notincluded]
             changedir = whatever
@@ -2411,7 +2415,7 @@ def test_listenvs_all(self, cmd, initproj):
             },
         )
         result = cmd("-a")
-        expected = ["py36", "py27", "py34", "pypy", "docs", "notincluded"]
+        expected = ["py36", "py27", "py34", "pypi", "docs", "notincluded"]
         assert result.outlines == expected
 
     def test_listenvs_all_verbose_description(self, cmd, initproj):

tox/constants.py

@@ -5,12 +5,19 @@
 import sys as _sys
 
 
-def _construct_default_factors(version_tuples, other_interpreters):
+def _construct_default_factors(cpython_versions, pypy_versions, other_interpreters):
     default_factors = {"py": _sys.executable, "py2": "python2", "py3": "python3"}
     default_factors.update(
         {
             "py{}{}".format(major, minor): "python{}.{}".format(major, minor)
-            for major, minor in version_tuples
+            for major, minor in cpython_versions
+        }
+    )
+    default_factors.update({exc: exc for exc in ["pypy", "pypy2", "pypy3"]})
+    default_factors.update(
+        {
+            "pypy{}{}".format(major, minor): "pypy{}.{}".format(major, minor)
+            for major, minor in pypy_versions
         }
     )
     default_factors.update({interpreter: interpreter for interpreter in other_interpreters})
@@ -19,8 +26,11 @@ def _construct_default_factors(version_tuples, other_interpreters):
 
 class PYTHON:
     CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7)]
-    OTHER_PYTHON_INTERPRETERS = ["jython", "pypy", "pypy3"]
-    DEFAULT_FACTORS = _construct_default_factors(CPYTHON_VERSION_TUPLES, OTHER_PYTHON_INTERPRETERS)
+    PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]
+    OTHER_PYTHON_INTERPRETERS = ["jython"]
+    DEFAULT_FACTORS = _construct_default_factors(
+        CPYTHON_VERSION_TUPLES, PYPY_VERSION_TUPLES, OTHER_PYTHON_INTERPRETERS
+    )
     CURRENT_RELEASE_ENV = "py36"
     """Should hold currently released py -> for easy updating"""
     QUICKSTART_PY_ENVS = ["py27", "py34", "py35", CURRENT_RELEASE_ENV, "pypy", "jython"]