Allow to use 3.10 as string in YAML config file

Author: humitos

readthedocs/config/config.py

@@ -255,7 +255,7 @@ def validate(self):
     @property
     def python_interpreter(self):
         ver = self.python_full_version
-        if not ver or isinstance(ver, (int, float)):
+        if not ver or isinstance(ver, (int, float)) or ver == '3.10':
             return 'python{}'.format(ver)
 
         # Allow to specify ``pypy3.5`` as Python interpreter
@@ -264,11 +264,11 @@ def python_interpreter(self):
     @property
     def python_full_version(self):
         ver = self.python.version
-        if ver in [2, 3]:
+        if ver in [2, 3, '2', '3']:
             # use default Python version if user only set '2', or '3'
             return self.get_default_python_version_for_image(
                 self.build.image,
-                ver,
+                int(ver),
             )
         return ver
 
@@ -513,19 +513,8 @@ def validate_python(self):
 
             if 'version' in raw_python:
                 with self.catch_validation_error('python.version'):
-                    # Try to convert strings to an int first, to catch '2', then
-                    # a float, to catch '2.7'
-                    version = raw_python['version']
-                    if isinstance(version, str):
-                        try:
-                            version = int(version)
-                        except ValueError:
-                            try:
-                                version = float(version)
-                            except ValueError:
-                                pass
                     python['version'] = validate_choice(
-                        version,
+                        raw_python['version'],
                         self.get_valid_python_versions(),
                     )
 
@@ -840,14 +829,6 @@ def validate_python(self):
         python = {}
         with self.catch_validation_error('python.version'):
             version = self.pop_config('python.version', 3)
-            if isinstance(version, str):
-                try:
-                    version = int(version)
-                except ValueError:
-                    try:
-                        version = float(version)
-                    except ValueError:
-                        pass
             python['version'] = validate_choice(
                 version,
                 self.get_valid_python_versions(),

readthedocs/config/tests/test_config.py

@@ -381,23 +381,6 @@ def test_it_validates_wrong_type(self):
         assert excinfo.value.key == 'python.version'
         assert excinfo.value.code == INVALID_CHOICE
 
-    def test_it_validates_wrong_type_right_value(self):
-        build = get_build_config(
-            {'python': {'version': '3.6'}},
-        )
-        build.validate()
-        assert build.python.version == 3.6
-        assert build.python_interpreter == 'python3.6'
-        assert build.python_full_version == 3.6
-
-        build = get_build_config(
-            {'python': {'version': '3'}},
-        )
-        build.validate()
-        assert build.python.version == 3
-        assert build.python_interpreter == 'python3.7'
-        assert build.python_full_version == 3.7
-
     def test_it_validates_env_supported_versions(self):
         build = get_build_config(
             {'python': {'version': 3.6}},
@@ -1030,7 +1013,19 @@ def test_python_version_accepts_string(self):
             },
         })
         build.validate()
-        assert build.python.version == 3.6
+        assert build.python.version == '3.6'
+
+    def test_python_version_310(self):
+        build = self.get_build_config({
+            'build': {
+                'image': 'testing',
+            },
+            'python': {
+                'version': '3.10',
+            },
+        })
+        build.validate()
+        assert build.python.version == '3.10'
 
     @pytest.mark.parametrize(
         'image,versions',

readthedocs/rtd_tests/tests/test_config_integration.py

@@ -124,7 +124,7 @@ def test_python_supported_versions_image_2_0(self, load_config):
         config = load_yaml_config(self.version)
         self.assertEqual(
             config.get_valid_python_versions(),
-            [2, 2.7, 3, 3.5],
+            [2, 2.7, 3, 3.5, '2', '2.7', '3', '3.5'],
         )
 
     @mock.patch('readthedocs.doc_builder.config.load_config')
@@ -135,7 +135,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, 'pypy3.5'],
+            [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 'pypy3.5', '2', '2.7', '3', '3.5', '3.6', '3.7', '3.8'],
         )
 
     @mock.patch('readthedocs.doc_builder.config.load_config')
@@ -166,6 +166,16 @@ def test_python_set_python_version_in_config(self, load_config):
         self.assertEqual(config.python.version, 3.5)
         self.assertEqual(config.python_interpreter, 'python3.5')
 
+    @mock.patch('readthedocs.doc_builder.config.load_config')
+    def test_python_set_python_310_version_in_config(self, load_config):
+        load_config.side_effect = create_load({
+            'build': {'image': 'testing'},
+            'python': {'version': '3.10'},
+        })
+        config = load_yaml_config(self.version)
+        self.assertEqual(config.python.version, '3.10')
+        self.assertEqual(config.python_interpreter, 'python3.10')
+
     @mock.patch('readthedocs.doc_builder.config.load_config')
     def test_python_invalid_version_in_config(self, load_config):
         load_config.side_effect = create_load({

readthedocs/settings/base.py

@@ -490,18 +490,22 @@ def TEMPLATES(self):
         },
         'readthedocs/build:7.0': {
             'python': {
-                # TODO: migrate these float numbers to be strings and avoid
-                # issues with ``3.10`` and ``3.1`` see
-                # https://github.com/readthedocs/readthedocs.org/pull/8328#discussion_r666366384
-                # for more details
-                'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 'pypy3.5'],
+                '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,
                 },
             },
         },
     }
+
+    # Convert all `python.supported_versions` to string for backward compatiblity
+    # see https://github.com/readthedocs/readthedocs.org/pull/8328#discussion_r666366384
+    for k in DOCKER_IMAGE_SETTINGS:
+        for version in DOCKER_IMAGE_SETTINGS[k]['python']['supported_versions']:
+            if isinstance(version, (int, float)):
+                DOCKER_IMAGE_SETTINGS[k]['python']['supported_versions'].append(str(version))
+
     # Alias tagged via ``docker tag`` on the build servers
     DOCKER_IMAGE_SETTINGS.update({
         'readthedocs/build:stable': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:5.0'),