Skip to content

Commit d8bdd4c

Browse files
committed
Update under feature flag
1 parent 699caa5 commit d8bdd4c

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

readthedocs/doc_builder/python_environments.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,13 @@ def install_core_requirements(self):
291291
]
292292

293293
if self.config.doctype == 'mkdocs':
294-
requirements.append('mkdocs<1.1')
294+
requirements.append(
295+
self.project.get_feature_value(
296+
Feature.DEFAULT_TO_MKDOCS_0_17_3,
297+
positive='mkdocs==0.17.3',
298+
negative='mkdocs<1.1',
299+
),
300+
)
295301
else:
296302
# We will assume semver here and only automate up to the next
297303
# backward incompatible release: 2.x

readthedocs/projects/models.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,7 @@ def add_features(sender, **kwargs):
13121312
USE_TESTING_BUILD_IMAGE = 'use_testing_build_image'
13131313
SHARE_SPHINX_DOCTREE = 'share_sphinx_doctree'
13141314
USE_PDF_LATEXMK = 'use_pdf_latexmk'
1315+
DEFAULT_TO_MKDOCS_0_17_3 = 'default_to_mkdocs_0_17_3'
13151316

13161317
FEATURES = (
13171318
(USE_SPHINX_LATEST, _('Use latest version of Sphinx')),
@@ -1346,6 +1347,10 @@ def add_features(sender, **kwargs):
13461347
SHARE_SPHINX_DOCTREE,
13471348
_('Use shared directory for doctrees'),
13481349
),
1350+
(
1351+
DEFAULT_TO_MKDOCS_0_17_3,
1352+
_('Install mkdocs 0.17.3 by default')
1353+
),
13491354
)
13501355

13511356
projects = models.ManyToManyField(

0 commit comments

Comments
 (0)