diff --git a/.readthedocs.yml b/.readthedocs.yml index 0e55d253be9..3be62e08d07 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,4 +3,4 @@ formats: all sphinx: configuration: docs/conf.py python: - requirements: requirements.txt + requirements: requirements/local-docs-build.txt diff --git a/requirements/lint.txt b/requirements/lint.txt index 5295543b4dd..d4a30debefa 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -14,3 +14,4 @@ pylint-celery==0.3 prospector==1.1.6.2 # prospector 1.1.6.2 is not compatible with 2.0.0 pyflakes<2.0.0 +Pygments==2.3.1 diff --git a/requirements/local-docs-build.txt b/requirements/local-docs-build.txt new file mode 100644 index 00000000000..3f36eec203b --- /dev/null +++ b/requirements/local-docs-build.txt @@ -0,0 +1,23 @@ +# Base packages +docutils==0.14 +Sphinx==1.8.3 +sphinx_rtd_theme==0.4.2 +sphinx-tabs==1.1.10 +# Required to avoid Transifex error with reserved slug +# https://github.com/sphinx-doc/sphinx-intl/pull/27 +git+https://github.com/agjohnson/sphinx-intl.git@7b5c66bdb30f872b3b1286e371f569c8dcb66de5#egg=sphinx-intl + +Pygments==2.3.1 + +mkdocs==1.0.4 +Markdown==3.0.1 + +# Docs +sphinxcontrib-httpdomain==1.7.0 +sphinx-prompt==1.0.0 + +# commonmark 0.5.5 is the latest version compatible with our docs, the +# newer ones make `tox -e docs` to fail +commonmark==0.5.5 + +recommonmark==0.4.0 diff --git a/requirements/onebox.txt b/requirements/onebox.txt deleted file mode 100644 index b18cb758833..00000000000 --- a/requirements/onebox.txt +++ /dev/null @@ -1,7 +0,0 @@ --r pip.txt -gunicorn -#For resizing images -pillow -python-memcached -whoosh -django-redis diff --git a/requirements/pip.txt b/requirements/pip.txt index e81abb35b73..6f815c9c3d7 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -2,18 +2,6 @@ pip==18.1 appdirs==1.4.3 virtualenv==16.2.0 -docutils==0.14 -Sphinx==1.8.3 -sphinx_rtd_theme==0.4.2 -sphinx-tabs==1.1.10 -# Required to avoid Transifex error with reserved slug -# https://github.com/sphinx-doc/sphinx-intl/pull/27 -git+https://github.com/agjohnson/sphinx-intl.git@7b5c66bdb30f872b3b1286e371f569c8dcb66de5#egg=sphinx-intl - -Pygments==2.3.1 - -mkdocs==1.0.4 -Markdown==3.0.1 django==1.11.18 six==1.12.0 @@ -96,16 +84,6 @@ djangorestframework-jsonp==1.0.2 django-taggit==0.23.0 dj-pagination==2.4.0 -# Docs -sphinxcontrib-httpdomain==1.7.0 -sphinx-prompt==1.0.0 - -# commonmark 0.5.5 is the latest version compatible with our docs, the -# newer ones make `tox -e docs` to fail -commonmark==0.5.5 - -recommonmark==0.4.0 - # Version comparison stuff packaging==18.0 diff --git a/requirements/testing.txt b/requirements/testing.txt index 77737f87f59..8c9cd8d55e2 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt django-dynamic-fixture==2.0.0 pytest==4.0.2