Implement mkdocs key

Author: stsewd

readthedocs/doc_builder/backends/mkdocs.py

@@ -61,14 +61,15 @@ def __init__(self, *args, **kwargs):
 
     def get_yaml_config(self):
         """Find the ``mkdocs.yml`` file in the project root."""
-        # TODO: try to load from the configuration file first.
-        test_path = os.path.join(
-            self.project.checkout_path(self.version.slug),
-            'mkdocs.yml'
-        )
-        if os.path.exists(test_path):
-            return test_path
-        return None
+        mkdoc_path = self.config.mkdocs.configuration
+        if not mkdoc_path:
+            mkdoc_path = os.path.join(
+                self.project.checkout_path(self.version.slug),
+                'mkdocs.yml'
+            )
+            if not os.path.exists(mkdoc_path):
+                return None
+        return mkdoc_path
 
     def load_yaml_config(self):
         """
@@ -198,6 +199,8 @@ def build(self):
             '--site-dir', self.build_dir,
             '--config-file', self.yaml_file,
         ]
+        if self.config.mkdocs.fail_on_warning:
+            build_command.append('--strict')
         if self.use_theme:
             build_command.extend(['--theme', 'readthedocs'])
         cmd_ret = self.run(

readthedocs/rtd_tests/tests/test_config_integration.py

@@ -728,7 +728,6 @@ def test_sphinx_fail_on_warning(
         append_conf.assert_called_once()
         move.assert_called_once()
 
-    @pytest.mark.skip
     @patch('readthedocs.doc_builder.backends.mkdocs.BaseMkdocs.move')
     @patch('readthedocs.doc_builder.backends.mkdocs.BaseMkdocs.append_conf')
     @patch('readthedocs.doc_builder.backends.mkdocs.BaseMkdocs.run')
@@ -767,7 +766,6 @@ def test_mkdocs_configuration(
         append_conf.assert_called_once()
         move.assert_called_once()
 
-    @pytest.mark.skip
     @patch('readthedocs.doc_builder.backends.mkdocs.BaseMkdocs.move')
     @patch('readthedocs.doc_builder.backends.mkdocs.BaseMkdocs.append_conf')
     @patch('readthedocs.doc_builder.backends.mkdocs.BaseMkdocs.run')