From 28379333dcb7bd7d47dad661340b4070836fc260 Mon Sep 17 00:00:00 2001 From: dojutsu-user Date: Sun, 13 Jan 2019 18:28:53 +0530 Subject: [PATCH 1/6] Split requirements files --- requirements/deploy.txt | 1 + requirements/lint.txt | 1 + requirements/local-docs-build.txt | 23 +++++++++++++++++++++++ requirements/onebox.txt | 1 + requirements/pip.txt | 22 ---------------------- requirements/testing.txt | 1 + 6 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 requirements/local-docs-build.txt diff --git a/requirements/deploy.txt b/requirements/deploy.txt index aeb1b9cdda6..a552e786ebb 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt # http://initd.org/psycopg/docs/install.html#binary-install-from-pypi psycopg2==2.7.6.1 --no-binary psycopg2 gunicorn==19.9.0 diff --git a/requirements/lint.txt b/requirements/lint.txt index 5295543b4dd..482373ade77 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt # We need these special cases of Python < 3 because we run tests with # Python 2 still # prospector 1.1.6.2 is not compatible with 2.1.0 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 index b18cb758833..53020dfc222 100644 --- a/requirements/onebox.txt +++ b/requirements/onebox.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt gunicorn #For resizing images pillow 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 From 29a1c2d62528c3b9cc1d9ea6c0e9dec9a38a8a35 Mon Sep 17 00:00:00 2001 From: dojutsu-user Date: Sun, 13 Jan 2019 20:05:20 +0530 Subject: [PATCH 2/6] add modifications --- requirements/deploy.txt | 1 - requirements/lint.txt | 1 - requirements/onebox.txt | 8 -------- 3 files changed, 10 deletions(-) delete mode 100644 requirements/onebox.txt diff --git a/requirements/deploy.txt b/requirements/deploy.txt index a552e786ebb..aeb1b9cdda6 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -1,5 +1,4 @@ -r pip.txt --r local-docs-build.txt # http://initd.org/psycopg/docs/install.html#binary-install-from-pypi psycopg2==2.7.6.1 --no-binary psycopg2 gunicorn==19.9.0 diff --git a/requirements/lint.txt b/requirements/lint.txt index 482373ade77..5295543b4dd 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -1,5 +1,4 @@ -r pip.txt --r local-docs-build.txt # We need these special cases of Python < 3 because we run tests with # Python 2 still # prospector 1.1.6.2 is not compatible with 2.1.0 diff --git a/requirements/onebox.txt b/requirements/onebox.txt deleted file mode 100644 index 53020dfc222..00000000000 --- a/requirements/onebox.txt +++ /dev/null @@ -1,8 +0,0 @@ --r pip.txt --r local-docs-build.txt -gunicorn -#For resizing images -pillow -python-memcached -whoosh -django-redis From 60c1c924cddd435a7d9884c12c1a4f890d6a946a Mon Sep 17 00:00:00 2001 From: dojutsu-user Date: Sun, 13 Jan 2019 20:21:40 +0530 Subject: [PATCH 3/6] add pygments to lint.txt --- requirements/lint.txt | 1 + 1 file changed, 1 insertion(+) 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 From f75778ef3e5204180bd9a54e9b18687825db9777 Mon Sep 17 00:00:00 2001 From: dojutsu-user Date: Mon, 14 Jan 2019 22:44:09 +0530 Subject: [PATCH 4/6] make docs.txt --- requirements/docs.txt | 10 ++++++++++ requirements/local-docs-build.txt | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 requirements/docs.txt diff --git a/requirements/docs.txt b/requirements/docs.txt new file mode 100644 index 00000000000..bb95e2f6b66 --- /dev/null +++ b/requirements/docs.txt @@ -0,0 +1,10 @@ +# Required for building RTD docs +-r local-docs-build.txt +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/local-docs-build.txt b/requirements/local-docs-build.txt index 3f36eec203b..819ebcd23b0 100644 --- a/requirements/local-docs-build.txt +++ b/requirements/local-docs-build.txt @@ -11,13 +11,3 @@ 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 From c52fe1383ad84c813fac8b54ca85a2faa5a2069c Mon Sep 17 00:00:00 2001 From: dojutsu-user Date: Tue, 15 Jan 2019 15:19:14 +0530 Subject: [PATCH 5/6] move docs requirements back to local-docs-build --- requirements/docs.txt | 10 ---------- requirements/local-docs-build.txt | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 requirements/docs.txt diff --git a/requirements/docs.txt b/requirements/docs.txt deleted file mode 100644 index bb95e2f6b66..00000000000 --- a/requirements/docs.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Required for building RTD docs --r local-docs-build.txt -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/local-docs-build.txt b/requirements/local-docs-build.txt index 819ebcd23b0..3f36eec203b 100644 --- a/requirements/local-docs-build.txt +++ b/requirements/local-docs-build.txt @@ -11,3 +11,13 @@ 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 From e9e14e6bbf5e9e306d22b4f682fdf51139753c56 Mon Sep 17 00:00:00 2001 From: dojutsu-user Date: Tue, 15 Jan 2019 23:49:16 +0530 Subject: [PATCH 6/6] edit readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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