Fix tests

Author: ericholscher

docs/yaml-config.rst

@@ -94,6 +94,13 @@ as defined here::
 * '2.0': 2, 2.7, 3, 3.5
 * 'latest': 2, 2.7, 3, 3.3, 3.4, 3.5, 3.6
 
+.. code-block:: yaml
+
+    build:
+        image: latest
+
+    python:
+        version: 3.6
 
 python
 ~~~~~~

readthedocs/doc_builder/config.py

@@ -57,7 +57,7 @@ def python_interpreter(self):
                 list(
                     filter(
                         lambda x: x < ver + 1,
-                        self._yaml_config.get_valid_python_versions(),
+                        self._yaml_config.PYTHON_SUPPORTED_VERSIONS,
                     )))
         return 'python{0}'.format(ver)
 

readthedocs/doc_builder/environments.py

@@ -491,7 +491,7 @@ def __init__(self, *args, **kwargs):
                 project_name=self.project.slug,
             )[:DOCKER_HOSTNAME_MAX_LEN]
         )
-        if self.config.build_image:
+        if self.config and self.config.build_image:
             self.container_image = self.config.build_image
         if self.project.container_mem_limit:
             self.container_mem_limit = self.project.container_mem_limit

readthedocs/rtd_tests/tests/test_config_wrapper.py

@@ -46,54 +46,6 @@ def setUp(self):
                            install_project=False, requirements_file='urls.py')
         self.version = get(Version, project=self.project)
 
-    def test_python_supported_versions_default_image_1_0(self, load_config):
-        load_config.side_effect = create_load()
-        self.project.container_image = 'readthedocs/build:1.0'
-        self.project.save()
-        config = load_yaml_config(self.version)
-        self.assertEqual(load_config.call_count, 1)
-        load_config.assert_has_calls([
-            mock.call(path=mock.ANY, env_config={
-                'python': {'supported_versions': [2, 2.7, 3, 3.4]},
-                'type': 'sphinx',
-                'output_base': '',
-                'name': mock.ANY
-            }),
-        ])
-        self.assertEqual(config.python_version, 2)
-
-    def test_python_supported_versions_image_2_0(self, load_config):
-        load_config.side_effect = create_load()
-        self.project.container_image = 'readthedocs/build:2.0'
-        self.project.save()
-        config = load_yaml_config(self.version)
-        self.assertEqual(load_config.call_count, 1)
-        load_config.assert_has_calls([
-            mock.call(path=mock.ANY, env_config={
-                'python': {'supported_versions': [2, 2.7, 3, 3.5]},
-                'type': 'sphinx',
-                'output_base': '',
-                'name': mock.ANY
-            }),
-        ])
-        self.assertEqual(config.python_version, 2)
-
-    def test_python_supported_versions_image_latest(self, load_config):
-        load_config.side_effect = create_load()
-        self.project.container_image = 'readthedocs/build:latest'
-        self.project.save()
-        config = load_yaml_config(self.version)
-        self.assertEqual(load_config.call_count, 1)
-        load_config.assert_has_calls([
-            mock.call(path=mock.ANY, env_config={
-                'python': {'supported_versions': [2, 2.7, 3, 3.3, 3.4, 3.5, 3.6]},
-                'type': 'sphinx',
-                'output_base': '',
-                'name': mock.ANY
-            }),
-        ])
-        self.assertEqual(config.python_version, 2)
-
     def test_python_default_version(self, load_config):
         load_config.side_effect = create_load()
         config = load_yaml_config(self.version)