Skip to content

Commit

Permalink
Install latest mkdocs by default as we do with sphinx (#7869)
Browse files Browse the repository at this point in the history
* Install latest mkdocs by default as we do with sphinx

* Use feature flag
  • Loading branch information
stsewd authored Mar 4, 2021
1 parent 33cb887 commit cf11d24
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 5 additions & 1 deletion readthedocs/doc_builder/python_environments.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,11 @@ def install_core_requirements(self):
self.project.get_feature_value(
Feature.DEFAULT_TO_MKDOCS_0_17_3,
positive='mkdocs==0.17.3',
negative='mkdocs<1.1',
negative=self.project.get_feature_value(
Feature.USE_MKDOCS_LATEST,
positive='mkdocs<1.1',
negative='mkdocs',
),
),
)
else:
Expand Down
2 changes: 2 additions & 0 deletions readthedocs/projects/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1591,6 +1591,7 @@ def add_features(sender, **kwargs):
USE_SPHINX_LATEST = 'use_sphinx_latest'
DONT_INSTALL_DOCUTILS = 'dont_install_docutils'
DEFAULT_TO_MKDOCS_0_17_3 = 'default_to_mkdocs_0_17_3'
USE_MKDOCS_LATEST = 'use_mkdocs_latest'
USE_SPHINX_RTD_EXT_LATEST = 'rtd_sphinx_ext_latest'
INSTALL_LATEST_SETUPTOOLS = 'install_latest_setuptoold'

Expand Down Expand Up @@ -1706,6 +1707,7 @@ def add_features(sender, **kwargs):
DEFAULT_TO_MKDOCS_0_17_3,
_('Install mkdocs 0.17.3 by default'),
),
(USE_MKDOCS_LATEST, _('Use latest version of MkDocs')),
(
USE_SPHINX_RTD_EXT_LATEST,
_('Use latest version of the Read the Docs Sphinx extension'),
Expand Down

0 comments on commit cf11d24

Please sign in to comment.