From 3aa12626240c616a3b85279bf68bf333eadbd1bc Mon Sep 17 00:00:00 2001 From: Raju Jha Date: Mon, 12 Mar 2018 01:48:09 +0530 Subject: [PATCH 1/2] #3757:Split requirements/pip.txt for LocalBuildEnvironment and RTD specific --- requirements/deploy.txt | 1 + requirements/lint.txt | 1 + requirements/local-docs-build.txt | 9 +++++++++ requirements/onebox.txt | 1 + requirements/pip.txt | 10 +--------- requirements/testing.txt | 1 + 6 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 requirements/local-docs-build.txt diff --git a/requirements/deploy.txt b/requirements/deploy.txt index b37f166c1be..29464a0c243 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt psycopg2==2.7.3.2 gunicorn==19.1.0 pysolr==2.0.13 diff --git a/requirements/lint.txt b/requirements/lint.txt index 74ba48b1bc9..d0ded141eba 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt maxcdn astroid pylint diff --git a/requirements/local-docs-build.txt b/requirements/local-docs-build.txt new file mode 100644 index 00000000000..d57119e8202 --- /dev/null +++ b/requirements/local-docs-build.txt @@ -0,0 +1,9 @@ +mkdocs==0.14.0 +sphinxcontrib-httpdomain==1.4.0 +commonmark==0.5.5 +recommonmark==0.4.0 +docutils==0.11 +Sphinx==1.5.3 +sphinx_rtd_theme==0.2.5b1 +readthedocs-build<2.1 + 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 e388316cbd2..7f66487283c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -2,15 +2,11 @@ pip==9.0.1 appdirs==1.4.3 virtualenv==15.0.1 -docutils==0.11 -Sphinx==1.5.3 -sphinx_rtd_theme==0.2.5b1 Pygments==2.2.0 -mkdocs==0.14.0 django==1.9.12 six==1.10.0 future==0.16.0 -readthedocs-build<2.1 +#readthedocs-build<2.1 django-tastypie==0.13.0 django-haystack==2.6.0 @@ -58,10 +54,6 @@ django-messages-extends==0.5 djangorestframework-jsonp==1.0.2 django-taggit==0.22.2 -# Docs -sphinxcontrib-httpdomain==1.4.0 -commonmark==0.5.5 -recommonmark==0.4.0 # Version comparison stuff packaging==16.8 diff --git a/requirements/testing.txt b/requirements/testing.txt index d328262d435..664630bcec3 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,4 +1,5 @@ -r pip.txt +-r local-docs-build.txt pytest<4,>=3.3.2 pytest-django==3.1.2 From 324ef2b5c22309dc48903881f2afd3f0f9ddee19 Mon Sep 17 00:00:00 2001 From: Raju Jha Date: Mon, 12 Mar 2018 01:53:04 +0530 Subject: [PATCH 2/2] Update pip.txt --- requirements/pip.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/pip.txt b/requirements/pip.txt index 7f66487283c..7c62ed63a25 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -6,7 +6,6 @@ Pygments==2.2.0 django==1.9.12 six==1.10.0 future==0.16.0 -#readthedocs-build<2.1 django-tastypie==0.13.0 django-haystack==2.6.0