Skip to content

Update mkdocs #5505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions readthedocs/doc_builder/backends/mkdocs.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-

"""
MkDocs_ backend for building docs.

.. _MkDocs: http://www.mkdocs.org/
"""

import json
import logging
import os
Expand Down
6 changes: 1 addition & 5 deletions readthedocs/doc_builder/python_environments.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

"""An abstraction over virtualenv and Conda environments."""

import copy
Expand All @@ -9,8 +7,6 @@
import os
import shutil

from django.conf import settings

from readthedocs.config import PIP, SETUPTOOLS
from readthedocs.config.models import PythonInstall, PythonInstallRequirements
from readthedocs.doc_builder.config import load_yaml_config
Expand Down Expand Up @@ -295,7 +291,7 @@ def install_core_requirements(self):
]

if self.config.doctype == 'mkdocs':
requirements.append('mkdocs==0.17.3')
requirements.append('mkdocs<1.1')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't seen anything breaking from their changelog since 1.0 :)

https://mkdocs.readthedocs.io/en/latest/about/release-notes/

1.1 is in current development

else:
# We will assume semver here and only automate up to the next
# backward incompatible release: 2.x
Expand Down