Skip to content

Commit

Permalink
Allow user to set build.image: testing in the config file
Browse files Browse the repository at this point in the history
  • Loading branch information
humitos committed Feb 19, 2020
1 parent 60fb1a3 commit 11a73a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions readthedocs/config/config.py
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
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

0 comments on commit 11a73a2

Please sign in to comment.