EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add start and termination to YAML file regex (#4584) 

* Add start and termination to YAML file regex

Otherwise it found files like:

  .hg/store/data/readthedocs.yml.i

* Update common submodule

* Tests (#4587)
agj/add-local-dev-docker
Manuel Kaufmann 2018-08-30 00:35:43 +02:00 committed by Anthony
parent b6bd7a66bf
commit dcb4270a62
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 5abc1d31f84c615dbfc060fd671efd85aade01f7 Subproject commit 9d653630c7285f8f2ec2deb06cb473e4ad6e0700

2
readthedocs/config/config.py
View File

@ -31,7 +31,7 @@ __all__ = (
) )
ALL = 'all' ALL = 'all'
CONFIG_FILENAME_REGEX = r'\.?readthedocs.ya?ml' CONFIG_FILENAME_REGEX = r'^\.?readthedocs.ya?ml$'
CONFIG_NOT_SUPPORTED = 'config-not-supported' CONFIG_NOT_SUPPORTED = 'config-not-supported'
VERSION_INVALID = 'version-invalid' VERSION_INVALID = 'version-invalid'

20
readthedocs/config/tests/test_config.py
View File

@ -2,8 +2,8 @@
from __future__ import division, print_function, unicode_literals from __future__ import division, print_function, unicode_literals
import os import os
import textwrap
import re import re
import textwrap
import pytest import pytest
from mock import DEFAULT, patch from mock import DEFAULT, patch
@ -13,8 +13,8 @@ from readthedocs.config import (
ALL, BuildConfigV1, BuildConfigV2, ConfigError, ALL, BuildConfigV1, BuildConfigV2, ConfigError,
ConfigOptionNotSupportedError, InvalidConfig, ProjectConfig, load) ConfigOptionNotSupportedError, InvalidConfig, ProjectConfig, load)
from readthedocs.config.config import ( from readthedocs.config.config import (
CONFIG_NOT_SUPPORTED, NAME_INVALID, NAME_REQUIRED, PYTHON_INVALID, CONFIG_FILENAME_REGEX, CONFIG_NOT_SUPPORTED, CONFIG_REQUIRED, NAME_INVALID,
VERSION_INVALID, CONFIG_FILENAME_REGEX) NAME_REQUIRED, PYTHON_INVALID, VERSION_INVALID)
from readthedocs.config.models import Conda from readthedocs.config.models import Conda
from readthedocs.config.validation import ( from readthedocs.config.validation import (
INVALID_BOOL, INVALID_CHOICE, INVALID_LIST, INVALID_PATH, INVALID_STRING) INVALID_BOOL, INVALID_CHOICE, INVALID_LIST, INVALID_PATH, INVALID_STRING)
@ -81,10 +81,20 @@ def get_env_config(extra=None):
return defaults return defaults
def test_load_no_config_file(tmpdir): @pytest.mark.parametrize('files', [
{},
{'readthedocs.ymlmore': ''},
{'startreadthedocs.yml': ''},
{'noroot': {'readthedocs.ymlmore': ''}},
{'noroot': {'startreadthedocs.yml': ''}},
{'readthebots.yaml': ''},
])
def test_load_no_config_file(tmpdir, files):
apply_fs(tmpdir, files)
base = str(tmpdir) base = str(tmpdir)
with raises(ConfigError): with raises(ConfigError) as e:
load(base, env_config) load(base, env_config)
assert e.value.code == CONFIG_REQUIRED
def test_load_empty_config_file(tmpdir): def test_load_empty_config_file(tmpdir):