diff --git a/Makefile b/Makefile index 665ac8f..7f6ddc7 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ virtualenv: install: requirements requirements: - $(PIP) install -r $(PROJECT_DIR)/requirements.txt + $(PIP) install -r $(PROJECT_DIR)/requirements/local.txt loaddata: $(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/myauth/fixtures/myauth.json diff --git a/requirements-dev.txt.old b/requirements-dev.txt.old deleted file mode 100644 index 7ece836..0000000 --- a/requirements-dev.txt.old +++ /dev/null @@ -1,39 +0,0 @@ -Django==1.5.8 -Pillow==2.2.1 -South==0.8.2 -amqp==1.4.5 -anyjson==0.3.3 -argparse==1.2.1 -billiard==3.3.0.18 -celery==3.1.12 -django-autocomplete-light==1.4.9 -django-classy-tags==0.5.1 -django-cms==3.0.2 -django-debug-toolbar==1.2.1 -django-filter==0.7 -django-mptt==0.6.0 -django-sekizai==0.7 -djangocms-admin-style==0.2.2 -html5lib==0.95 -ipython==2.1.0 -kombu==3.0.20 -pisa==3.0.33 -psycopg2 -pyPdf==1.13 -python-dateutil==2.2 -pytils==0.2.3 -pytz==2014.4 -reportlab==2.7 -simplejson==3.3.1 -six==1.4.1 -sqlparse==0.1.11 -wsgiref==0.1.2 -xlrd==0.9.2 -xlwt==0.7.5 -xlutils==1.7.1 - -# dev -django-devserver -django-eml-email-backend -django-debug-toolbar -ipython diff --git a/requirements.txt.old b/requirements.txt.old deleted file mode 100644 index a53a6c4..0000000 --- a/requirements.txt.old +++ /dev/null @@ -1,57 +0,0 @@ -Django==1.5.8 -Pillow==2.2.1 -South==1.0 -Unidecode==0.4.17 -amqp==1.4.5 -anyjson==0.3.3 -argparse==1.2.1 -billiard==3.3.0.18 -celery==3.1.12 -cmsplugin-filer==0.10.1 -django-appconf==1.0.1 -django-autocomplete-light==1.4.9 -django-classy-tags==0.5.1 -django-cms==3.0.10 -django-debug-toolbar==1.2.1 -django-devserver==0.8.0 -django-eml-email-backend==0.1 -django-filer==0.9.9 -django-filter==0.11.0 -django-mptt==0.6.1 -django-polymorphic==0.6.1 -django-sekizai==0.7 -django-simple-captcha==0.4.2 -djangocms-admin-style==0.2.2 -git+https://github.com/igloox/djangocms-ckeditor-filer.git@799c8e853978d8807e9561295f6abca8172c4443 -djangocms-file==0.0.1 -djangocms-flash==0.0.2 -djangocms-googlemap==0.0.5 -djangocms-inherit==0.0.1 -djangocms-link==1.3.5 -djangocms-picture==0.0.2 -djangocms-snippet==1.0.2 -djangocms-teaser==0.0.1 -djangocms-text-ckeditor==2.1.6 -djangocms-video==0.0.1 -easy-thumbnails==2.2 -flup==1.0.2 -ghostscript==0.4.1 -html5lib==0.999 -ipython==2.1.0 -kombu==3.0.20 -pisa==3.0.33 -psycopg2==2.6 -pyPdf==1.13 -python-dateutil==2.2 -pytils==0.2.3 -pytz==2014.4 -reportlab==2.7 -simplejson==3.3.1 -six==1.7.3 -sqlparse==0.1.11 -wsgiref==0.1.2 -xlrd==0.9.2 -xlutils==1.7.1 -xlwt==0.7.5 - -python-memcached==1.58 diff --git a/requirements.txt b/requirements/base.txt similarity index 94% rename from requirements.txt rename to requirements/base.txt index 2d33e2f..7f5079d 100644 --- a/requirements.txt +++ b/requirements/base.txt @@ -1,3 +1,4 @@ +Django==1.8 amqp==2.1.4 anyjson==0.3.3 appdirs==1.4.3 @@ -7,13 +8,10 @@ billiard==3.5.0.2 celery==4.0.2 cmsplugin-filer==1.0.0 configparser==3.5.0 -Django==1.8 django-appconf==1.0.1 django-autocomplete-light==2.1.1 django-classy-tags==0.8.0 django-cms==3.4.3 -django-debug-toolbar==1.5 -django-eml-email-backend==0.1 django-filer==1.2.7 django-filter==0.11.0 django-formtools==1.0 @@ -50,7 +48,6 @@ olefile==0.44 packaging==16.8 Pillow==4.1.0 pisa==3.0.33 -psycopg2==2.6 pylint==1.6.5 pyparsing==2.2.0 pyPdf==1.13 @@ -72,4 +69,4 @@ wrapt==1.10.10 xhtml2pdf==0.2b1 xlrd==1.0.0 xlutils==2.0.0 -xlwt==1.2.0 +xlwt==1.2.0 \ No newline at end of file diff --git a/requirements/local.txt b/requirements/local.txt new file mode 100644 index 0000000..6c1b882 --- /dev/null +++ b/requirements/local.txt @@ -0,0 +1,3 @@ +- r base.txt +django-debug-toolbar==1.4 +django-eml-email-backend==0.1 \ No newline at end of file diff --git a/requirements/prodaction.txt b/requirements/prodaction.txt new file mode 100644 index 0000000..ee9120d --- /dev/null +++ b/requirements/prodaction.txt @@ -0,0 +1,2 @@ +- r base.txt +psycopg2==2.6 \ No newline at end of file diff --git a/requirements/staging.txt b/requirements/staging.txt new file mode 100644 index 0000000..ee9120d --- /dev/null +++ b/requirements/staging.txt @@ -0,0 +1,2 @@ +- r base.txt +psycopg2==2.6 \ No newline at end of file