Skip to content

Commit cb85c73

Browse files
authored
MkDocs: fix USE_MKDOCS_LATEST feature flag logic (#10515)
* MkDocs: fix `USE_MKDOCS_LATEST` feature flag logic The logic was inverted and we were installing old MkDocs version to projects with `USE_MKDOCS_LATEST` feature flag. Closes #10402 * MkDocs: remove `USE_MKDOCS_LATEST` This is not required anymore since the logic was inverted and we were installing always the latest version for old projects, but the old version for new projects. It's better to have all of them installing the latest version and call it a day :)
1 parent e69a698 commit cb85c73

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

docs/user/build-default-versions.rst

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ Sphinx:
4141

4242
Mkdocs:
4343
Projects created before April 3, 2019 (April 23, 2019 for :doc:`/commercial/index`) use ``0.17.3``.
44-
Projects created before March 9, 2021 use ``1.0.4``.
4544
New projects use the latest version.
4645

4746
sphinx-rtd-theme:

readthedocs/doc_builder/python_environments.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,8 @@ def install_core_requirements(self):
209209
self.project.get_feature_value(
210210
Feature.DEFAULT_TO_MKDOCS_0_17_3,
211211
positive='mkdocs==0.17.3',
212-
negative=self.project.get_feature_value(
213-
Feature.USE_MKDOCS_LATEST,
214-
positive='mkdocs<1.1',
215-
negative='mkdocs',
216-
),
217-
),
212+
negative="mkdocs",
213+
)
218214
)
219215
else:
220216
requirements.extend(

readthedocs/projects/models.py

-2
Original file line numberDiff line numberDiff line change
@@ -1926,7 +1926,6 @@ def add_features(sender, **kwargs):
19261926
DONT_INSTALL_LATEST_PIP = 'dont_install_latest_pip'
19271927
USE_SPHINX_LATEST = 'use_sphinx_latest'
19281928
DEFAULT_TO_MKDOCS_0_17_3 = 'default_to_mkdocs_0_17_3'
1929-
USE_MKDOCS_LATEST = 'use_mkdocs_latest'
19301929
USE_SPHINX_RTD_EXT_LATEST = 'rtd_sphinx_ext_latest'
19311930

19321931
# Search related features
@@ -2033,7 +2032,6 @@ def add_features(sender, **kwargs):
20332032
DEFAULT_TO_MKDOCS_0_17_3,
20342033
_("MkDOcs: Install mkdocs 0.17.3 by default"),
20352034
),
2036-
(USE_MKDOCS_LATEST, _("MkDocs: Use latest version of MkDocs")),
20372035
(
20382036
USE_SPHINX_RTD_EXT_LATEST,
20392037
_("Sphinx: Use latest version of the Read the Docs Sphinx extension"),

0 commit comments

Comments
 (0)