From fc38940ce0727c5fcc095514caf316f4e077095f Mon Sep 17 00:00:00 2001 From: Berker Peksag <berker.peksag@gmail.com> Date: Wed, 19 Jul 2017 01:47:29 +0300 Subject: [PATCH] Refactor requirement files to make installation easier Closes #987 --- base-requirements.txt | 42 +++++++++++++++++++++++++++++++++++++ dev-requirements.txt | 3 ++- prod-requirements.txt | 3 +++ requirements.txt | 48 ++----------------------------------------- 4 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 base-requirements.txt create mode 100644 prod-requirements.txt diff --git a/base-requirements.txt b/base-requirements.txt new file mode 100644 index 000000000..f9f4f592a --- /dev/null +++ b/base-requirements.txt @@ -0,0 +1,42 @@ +dj-database-url==0.3.0 +django-braces==1.8.1 +django-discover-runner==1.0 +django-pipeline==1.4.5 +django-sitetree==1.2.1 +django-secure==1.0.1 +Django==1.7.11 +docutils==0.12 +factory-boy==2.4.1 +Markdown==2.5.2 +Pillow==2.7.0 +psycopg2==2.6 +python3-openid==3.0.5 +lxml==3.4.4 +cssselect==0.9.1 +feedparser==5.2.1 +beautifulsoup4==4.3.2 +icalendar==3.8.4 +chardet2==2.0.3 +django-imagekit==3.2.5 +django-haystack==2.3.1 +elasticsearch==1.3.0 +pyelasticsearch==0.6.1 +django-tastypie==0.12.1 + +pytz==2016.7 +python-dateutil==2.4.0 + +django-timedeltafield==0.7.3 + +requests==2.5.1 + +django-jsonfield==0.9.13 +git+https://github.com/danirus/django-comments-xtd.git@182b54afc62e5d3967be75ac6ed8b19071764a6d + +django-honeypot==0.4.0 +django-markupfield==1.3.2 + +django-allauth==0.22.0 + +django-waffle==0.11.1 +sqlparse<0.2 #TODO: delete this when we switch to Django 1.8 and DDT 1.5 diff --git a/dev-requirements.txt b/dev-requirements.txt index b53f41606..f566b7906 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,7 @@ --r requirements.txt +-r base-requirements.txt # Extra stuff required for local dev +django-debug-toolbar coverage ddt diff --git a/prod-requirements.txt b/prod-requirements.txt new file mode 100644 index 000000000..b3a780529 --- /dev/null +++ b/prod-requirements.txt @@ -0,0 +1,3 @@ +uWSGI==2.0.10 + +raven==5.2.0 diff --git a/requirements.txt b/requirements.txt index cd9e6d31b..1b66eee00 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,46 +1,2 @@ -dj-database-url==0.3.0 -django-braces==1.8.1 -django-discover-runner==1.0 -django-pipeline==1.4.5 -django-sitetree==1.2.1 -django-secure==1.0.1 -Django==1.7.11 -docutils==0.12 -factory-boy==2.4.1 -Markdown==2.5.2 -Pillow==2.7.0 -psycopg2==2.6 -python3-openid==3.0.5 -lxml==3.4.4 -cssselect==0.9.1 -feedparser==5.2.1 -beautifulsoup4==4.3.2 -icalendar==3.8.4 -chardet2==2.0.3 -django-imagekit==3.2.5 -django-haystack==2.3.1 -elasticsearch==1.3.0 -pyelasticsearch==0.6.1 -django-tastypie==0.12.1 -django-debug-toolbar==1.2.2 - -pytz==2016.7 -python-dateutil==2.4.0 - -django-timedeltafield==0.7.3 - -requests==2.5.1 - -django-jsonfield==0.9.13 -git+https://github.com/danirus/django-comments-xtd.git@182b54afc62e5d3967be75ac6ed8b19071764a6d - -django-honeypot==0.4.0 -django-markupfield==1.3.2 - -django-allauth==0.22.0 - -uWSGI==2.0.10 - -raven==5.2.0 -django-waffle==0.11.1 -sqlparse<0.2 #TODO: delete this when we switch to Django 1.8 and DDT 1.5 +-r base-requirements.txt +-r prod-requirements.txt