Revert "Build: remove PyPy support" (#10522)

Revert "Build: remove PyPy support (#10514)"

This reverts commit a1b606f.

Author: humitos

docs/user/config-file/v1.rst

@@ -125,9 +125,9 @@ Certain Python versions require a certain build image,
 as defined here:
 
 * ``stable``:
-  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``
+  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``pypy3.5``
 * ``latest``:
-  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``3.8``
+  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``3.8``, ``pypy3.5``
 
 .. code-block:: yaml
 
@@ -149,7 +149,7 @@ python.version
 ``````````````
 
 * Default: ``3.7``
-* Options: ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``3.8``
+* Options: ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``3.8``, ``pypy3.5``
 
 This is the version of Python to use when building your documentation.
 If you specify only the major version of Python,

docs/user/config-file/v2.rst

@@ -310,7 +310,7 @@ build.tools.python
 ``````````````````
 
 Python version to use.
-You can use several interpreters and versions, from CPython, Miniconda, and Mamba.
+You can use several interpreters and versions, from CPython, PyPy, Miniconda, and Mamba.
 
 .. note::
 
@@ -328,6 +328,9 @@ You can use several interpreters and versions, from CPython, Miniconda, and Mamb
   - ``3.9``
   - ``3.10``
   - ``3.11``
+  - ``pypy3.7``
+  - ``pypy3.8``
+  - ``pypy3.9``
   - ``miniconda3-4.7``
   - ``mambaforge-4.10``
 
@@ -824,9 +827,9 @@ Each image support different Python versions and has different packages installe
 as defined here:
 
 * `stable <https://github.com/readthedocs/readthedocs-docker-images/tree/releases/5.x>`_:
-  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``
+  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``pypy3.5``
 * `latest <https://github.com/readthedocs/readthedocs-docker-images/tree/releases/6.x>`_:
-  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``3.8``
+  ``2``, ``2.7``, ``3``, ``3.5``, ``3.6``, ``3.7``, ``3.8``, ``pypy3.5``
 
 python.version (legacy)
 ```````````````````````

readthedocs/config/config.py

@@ -306,6 +306,9 @@ def python_interpreter(self):
                 return 'python'
             return None
         version = self.python_full_version
+        if version.startswith('pypy'):
+            # Allow to specify ``pypy3.5`` as Python interpreter
+            return version
         return f'python{version}'
 
     @property

readthedocs/config/tests/test_config.py

@@ -430,6 +430,15 @@ def test_it_supports_other_versions(self):
         assert build.python_interpreter == 'python3.7'
         assert build.python_full_version == '3.7'
 
+    def test_it_supports_string_versions(self):
+        build = get_build_config(
+            {'python': {'version': 'pypy3.5'}},
+        )
+        build.validate()
+        assert build.python.version == 'pypy3.5'
+        assert build.python_interpreter == 'pypy3.5'
+        assert build.python_full_version == 'pypy3.5'
+
     def test_it_validates_versions_out_of_range(self):
         build = get_build_config(
             {'python': {'version': 1.0}},
@@ -1301,8 +1310,8 @@ def test_python_check_invalid_types(self, value):
     @pytest.mark.parametrize(
         'image,versions',
         [
-            ("latest", ["2", "2.7", "3", "3.5", "3.6", "3.7"]),
-            ("stable", ["2", "2.7", "3", "3.5", "3.6", "3.7"]),
+            ('latest', ['2', '2.7', '3', '3.5', '3.6', '3.7', 'pypy3.5']),
+            ('stable', ['2', '2.7', '3', '3.5', '3.6', '3.7']),
         ],
     )
     def test_python_version(self, image, versions):

readthedocs/rtd_tests/fixtures/spec/v2/schema.json

@@ -176,6 +176,9 @@
                     "3.9",
                     "3.10",
                     "3.11",
+                    "pypy3.7",
+                    "pypy3.8",
+                    "pypy3.9",
                     "miniconda3-4.7",
                     "mambaforge-4.10"
                   ]
@@ -253,6 +256,7 @@
             "3.3",
             "3.4",
             "3.5",
+            "pypy3.5",
             "3.6",
             "3.7",
             "3.8"

readthedocs/rtd_tests/tests/test_config_integration.py

@@ -122,7 +122,7 @@ def test_python_supported_versions_image_latest(self, load_config):
         config = load_yaml_config(self.version)
         self.assertEqual(
             config.get_valid_python_versions(),
-            ["2", "2.7", "3", "3.5", "3.6", "3.7", "3.8"],
+            ['2', '2.7', '3', '3.5', '3.6', '3.7', '3.8', 'pypy3.5'],
         )
 
     @mock.patch('readthedocs.doc_builder.config.load_config')

readthedocs/settings/base.py

@@ -585,7 +585,7 @@ def TEMPLATES(self):
         },
         'readthedocs/build:5.0': {
             'python': {
-                'supported_versions': ['2', '2.7', '3', '3.5', '3.6', '3.7'],
+                'supported_versions': ['2', '2.7', '3', '3.5', '3.6', '3.7', 'pypy3.5'],
                 'default_version': {
                     '2': '2.7',
                     '3': '3.7',
@@ -594,7 +594,7 @@ def TEMPLATES(self):
         },
         'readthedocs/build:6.0': {
             'python': {
-                'supported_versions': ['2', '2.7', '3', '3.5', '3.6', '3.7', '3.8'],
+                'supported_versions': ['2', '2.7', '3', '3.5', '3.6', '3.7', '3.8', 'pypy3.5'],
                 'default_version': {
                     '2': '2.7',
                     '3': '3.7',
@@ -603,7 +603,7 @@ def TEMPLATES(self):
         },
         'readthedocs/build:7.0': {
             'python': {
-                'supported_versions': ['2', '2.7', '3', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10'],
+                'supported_versions': ['2', '2.7', '3', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3.5'],
                 'default_version': {
                     '2': '2.7',
                     '3': '3.7',
@@ -648,6 +648,9 @@ def TEMPLATES(self):
                 '3.9': '3.9.17',
                 '3.10': '3.10.12',
                 '3.11': '3.11.4',
+                'pypy3.7': 'pypy3.7-7.3.9',
+                'pypy3.8': 'pypy3.8-7.3.11',
+                'pypy3.9': 'pypy3.9-7.3.12',
                 'miniconda3-4.7': 'miniconda3-4.7.12',
                 'mambaforge-4.10': 'mambaforge-4.10.3-10',
             },