Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New docker release (6.0 and testing) #6654

Merged
merged 4 commits into from
Feb 17, 2020
Merged

New docker release (6.0 and testing) #6654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7922e0c
Release Docker image 6.0
humitos Feb 13, 2020
fd0cf47
Add support for a `testing` Docker image
humitos Feb 13, 2020
1c0a502
Adapt tests to the new values
humitos Feb 13, 2020
fd4345d
Add testing as an alias to 7.0
ericholscher Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions readthedocs/config/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/rtd_tests/tests/test_config_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
16 changes: 13 additions & 3 deletions readthedocs/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand All @@ -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'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this change everybody who was pointed at stable in their config file to use readthedocs/build:5.0 when previously they were using readthedocs/build:4.0? I'm not super familiar with the backwards compatibility of our docker images but is that what we want?

'readthedocs/build:latest': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:6.0'),
'readthedocs/build:testing': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:7.0'),
})

# All auth
Expand Down