Merge pull request #6654 from readthedocs/humitos/new-docker-release

New docker release (6.0 and testing)
readthedocs · Feb 17, 2020 · 50c63f7 · 50c63f7
2 parents b1a2da3 + fd4345d
commit 50c63f7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/readthedocs/config/tests/test_config.py b/readthedocs/config/tests/test_config.py
@@ -974,8 +974,8 @@ def test_python_version_accepts_string(self):
     @pytest.mark.parametrize(
         'image,versions',
         [
-            ('latest', [1, 2.8, 4, 3.8]),
-            ('stable', [1, 2.8, 4, 3.8]),
+            ('latest', [1, 2.8, 4]),
+            ('stable', [1, 2.8, 4]),
         ],
     )
     def test_python_version_invalid(self, image, versions):

diff --git a/readthedocs/rtd_tests/tests/test_config_integration.py b/readthedocs/rtd_tests/tests/test_config_integration.py
@@ -146,7 +146,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, 'pypy3.5'],
+            [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 'pypy3.5'],
         )
 
     @mock.patch('readthedocs.doc_builder.config.load_config')

diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
@@ -415,7 +415,16 @@ def USE_PROMOS(self):  # noqa
                 },
             },
         },
-        'readthedocs/build:6.0rc1': {
+        'readthedocs/build:6.0': {
+            'python': {
+                'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 'pypy3.5'],
+                'default_version': {
+                    2: 2.7,
+                    3: 3.7,
+                },
+            },
+        },
+        'readthedocs/build:7.0': {
             'python': {
                 'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 'pypy3.5'],
                 'default_version': {
@@ -428,8 +437,9 @@ def USE_PROMOS(self):  # noqa
 
     # Alias tagged via ``docker tag`` on the build servers
     DOCKER_IMAGE_SETTINGS.update({
-        'readthedocs/build:stable': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:4.0'),
-        'readthedocs/build:latest': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:5.0'),
+        'readthedocs/build:stable': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:5.0'),
+        'readthedocs/build:latest': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:6.0'),
+        'readthedocs/build:testing': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:7.0'),
     })
 
     # All auth