Support 6.0rc1 build image (#6329)

humitos · web-flow · commit 29f603ab6150 · 2019-10-31T11:58:27.000+01:00
Support 6.0rc1 build image
diff --git a/readthedocs/rtd_tests/tests/test_config_integration.py b/readthedocs/rtd_tests/tests/test_config_integration.py
@@ -75,6 +75,7 @@ def setUp(self):
             Project,
             main_language_project=None,
             install_project=False,
+            container_image=None,
         )
         self.version = get(Version, project=self.project)
 
diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
@@ -367,6 +367,9 @@ def USE_PROMOS(self):  # noqa
         'readthedocs/build:5.0': {
             'python': {'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 'pypy3.5']},
         },
+        'readthedocs/build:6.0rc1': {
+            'python': {'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 'pypy3.5']},
+        },
     }
 
     # Alias tagged via ``docker tag`` on the build servers

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ def setUp(self):`
`75`	`75`	`Project,`
`76`	`76`	`main_language_project=None,`
`77`	`77`	`install_project=False,`
	`78`	`+ container_image=None,`
`78`	`79`	`)`
`79`	`80`	`self.version = get(Version, project=self.project)`
`80`	`81`
Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,9 @@ def USE_PROMOS(self): # noqa`
`367`	`367`	`'readthedocs/build:5.0': {`
`368`	`368`	`'python': {'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 'pypy3.5']},`
`369`	`369`	`},`
	`370`	`+ 'readthedocs/build:6.0rc1': {`
	`371`	`+ 'python': {'supported_versions': [2, 2.7, 3, 3.5, 3.6, 3.7, 3.8, 'pypy3.5']},`
	`372`	`+ },`
`370`	`373`	`}`
`371`	`374`
`372`	`375`	# Alias tagged via ``docker tag`` on the build servers