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

Allow user to set build.image: testing in the config file #6676

Merged
merged 1 commit into from
Mar 3, 2020
Merged

Allow user to set build.image: testing in the config file #6676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ def valid_build_images(self):
The user can use any of this values in the YAML file. These values are
the keys of ``DOCKER_IMAGE_SETTINGS`` Django setting (without the
``readthedocs/build`` part) plus ``stable`` and ``latest``.
``readthedocs/build`` part) plus ``stable``, ``latest`` and ``testing``.
"""
images = {'stable', 'latest'}
images = {'stable', 'latest', 'testing'}
for k in settings.DOCKER_IMAGE_SETTINGS:
_, version = k.split(':')
if re.fullmatch(r'^[\d\.]+$', version):
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/config/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ def test_conda_check_file_required(self):
build.validate()
assert excinfo.value.key == 'conda.environment'

@pytest.mark.parametrize('value', ['stable', 'latest'])
@pytest.mark.parametrize('value', ['stable', 'latest', 'testing'])
def test_build_image_check_valid(self, value):
build = self.get_build_config({'build': {'image': value}})
build.validate()
Expand Down