Skip to content

Commit cf11d24

Browse files
authored
Install latest mkdocs by default as we do with sphinx (#7869)
* Install latest mkdocs by default as we do with sphinx * Use feature flag
1 parent 33cb887 commit cf11d24

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

readthedocs/doc_builder/python_environments.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,11 @@ def install_core_requirements(self):
373373
self.project.get_feature_value(
374374
Feature.DEFAULT_TO_MKDOCS_0_17_3,
375375
positive='mkdocs==0.17.3',
376-
negative='mkdocs<1.1',
376+
negative=self.project.get_feature_value(
377+
Feature.USE_MKDOCS_LATEST,
378+
positive='mkdocs<1.1',
379+
negative='mkdocs',
380+
),
377381
),
378382
)
379383
else:

readthedocs/projects/models.py

+2
Original file line numberDiff line numberDiff line change
@@ -1591,6 +1591,7 @@ def add_features(sender, **kwargs):
15911591
USE_SPHINX_LATEST = 'use_sphinx_latest'
15921592
DONT_INSTALL_DOCUTILS = 'dont_install_docutils'
15931593
DEFAULT_TO_MKDOCS_0_17_3 = 'default_to_mkdocs_0_17_3'
1594+
USE_MKDOCS_LATEST = 'use_mkdocs_latest'
15941595
USE_SPHINX_RTD_EXT_LATEST = 'rtd_sphinx_ext_latest'
15951596
INSTALL_LATEST_SETUPTOOLS = 'install_latest_setuptoold'
15961597

@@ -1706,6 +1707,7 @@ def add_features(sender, **kwargs):
17061707
DEFAULT_TO_MKDOCS_0_17_3,
17071708
_('Install mkdocs 0.17.3 by default'),
17081709
),
1710+
(USE_MKDOCS_LATEST, _('Use latest version of MkDocs')),
17091711
(
17101712
USE_SPHINX_RTD_EXT_LATEST,
17111713
_('Use latest version of the Read the Docs Sphinx extension'),

0 commit comments

Comments
 (0)