Remove support for multiple configurations in one file

Author: stsewd

readthedocs/config/config.py

@@ -36,7 +36,6 @@
     'ConfigError',
     'ConfigOptionNotSupportedError',
     'InvalidConfig',
-    'ProjectConfig',
 )
 
 ALL = 'all'
@@ -110,12 +109,10 @@ class InvalidConfig(ConfigError):
 
     message_template = 'Invalid "{key}": {error}'
 
-    def __init__(self, key, code, error_message, source_file=None,
-                 source_position=None):
+    def __init__(self, key, code, error_message, source_file=None):
         self.key = key
         self.code = code
         self.source_file = source_file
-        self.source_position = source_position
         message = self.message_template.format(
             key=key,
             code=code,
@@ -144,11 +141,10 @@ class BuildConfigBase(object):
 
     version = None
 
-    def __init__(self, env_config, raw_config, source_file, source_position):
+    def __init__(self, env_config, raw_config, source_file):
         self.env_config = env_config
         self.raw_config = raw_config
         self.source_file = source_file
-        self.source_position = source_position
         if os.path.isdir(self.source_file):
             self.base_path = self.source_file
         else:
@@ -160,10 +156,7 @@ def __init__(self, env_config, raw_config, source_file, source_position):
     def error(self, key, message, code):
         """Raise an error related to ``key``."""
         if not os.path.isdir(self.source_file):
-            source = '{file} [{pos}]'.format(
-                file=os.path.relpath(self.source_file, self.base_path),
-                pos=self.source_position,
-            )
+            source = os.path.relpath(self.source_file, self.base_path)
             error_message = '{source}: {message}'.format(
                 source=source,
                 message=message,
@@ -175,7 +168,6 @@ def error(self, key, message, code):
             code=code,
             error_message=error_message,
             source_file=self.source_file,
-            source_position=self.source_position,
         )
 
     @contextmanager
@@ -189,7 +181,6 @@ def catch_validation_error(self, key):
                 code=error.code,
                 error_message=str(error),
                 source_file=self.source_file,
-                source_position=self.source_position,
             )
 
     def pop(self, name, container, default, raise_ex):
@@ -1043,16 +1034,6 @@ def submodules(self):
         return Submodules(**self._config['submodules'])
 
 
-class ProjectConfig(list):
-
-    """Wrapper for multiple build configs."""
-
-    def validate(self):
-        """Validates each configuration build."""
-        for build in self:
-            build.validate()
-
-
 def load(path, env_config):
     """
     Load a project configuration and the top-most build config for a given path.
@@ -1068,10 +1049,9 @@ def load(path, env_config):
             'No configuration file found',
             code=CONFIG_REQUIRED
         )
-    build_configs = []
     with open(filename, 'r') as configuration_file:
         try:
-            configs = parse(configuration_file.read())
+            config = parse(configuration_file.read())
         except ParseError as error:
             raise ConfigError(
                 'Parse error in {filename}: {message}'.format(
@@ -1080,23 +1060,19 @@ def load(path, env_config):
                 ),
                 code=CONFIG_SYNTAX_INVALID,
             )
-        for i, config in enumerate(configs):
-            allow_v2 = env_config.get('allow_v2')
-            if allow_v2:
-                version = config.get('version', 1)
-            else:
-                version = 1
-            build_config = get_configuration_class(version)(
-                env_config,
-                config,
-                source_file=filename,
-                source_position=i,
-            )
-            build_configs.append(build_config)
+        allow_v2 = env_config.get('allow_v2')
+        if allow_v2:
+            version = config.get('version', 1)
+        else:
+            version = 1
+        build_config = get_configuration_class(version)(
+            env_config,
+            config,
+            source_file=filename,
+        )
 
-    project_config = ProjectConfig(build_configs)
-    project_config.validate()
-    return project_config
+    build_config.validate()
+    return build_config
 
 
 def get_configuration_class(version):

readthedocs/config/parser.py

@@ -17,18 +17,17 @@ class ParseError(Exception):
 
 def parse(stream):
     """
-    Take file-like object and return a list of project configurations.
+    Take file-like object and return a project configuration.
 
-    The files need be valid YAML and only contain mappings as documents.
+    The file need be valid YAML and only contain mappings as document.
     Everything else raises a ``ParseError``.
     """
     try:
-        configs = list(yaml.safe_load_all(stream))
+        config = yaml.safe_load(stream)
     except yaml.YAMLError as error:
         raise ParseError('YAML: {message}'.format(message=error))
-    if not configs:
+    if not isinstance(config, dict):
+        raise ParseError('Expected mapping')
+    if not config:
         raise ParseError('Empty config')
-    for config in configs:
-        if not isinstance(config, dict):
-            raise ParseError('Expected mapping')
-    return configs
+    return config

readthedocs/doc_builder/config.py

@@ -65,7 +65,7 @@ def load_yaml_config(version):
         config = load_config(
             path=checkout_path,
             env_config=env_config,
-        )[0]
+        )
     except InvalidConfig:
         # This is a subclass of ConfigError, so has to come first
         raise
@@ -74,7 +74,6 @@ def load_yaml_config(version):
             env_config=env_config,
             raw_config={},
             source_file=checkout_path,
-            source_position=0,
         )
         config.validate()
     return config