diff --git a/src/Makefile b/src/Makefile index 75067417f0..d79277f041 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,14 @@ -all: localecompile +all: localecompile staticfiles +production: localecompile staticfiles compress localecompile: - django-admin compilemessages + ./manage.py compilemessages localegen: - django-admin makemessages --all + ./manage.py makemessages --all + +staticfiles: + ./manage.py collectstatic --noinput + +compress: + ./manage.py compress diff --git a/src/manage.py b/src/manage.py index 4dbadaca86..ff13d7d950 100755 --- a/src/manage.py +++ b/src/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys diff --git a/src/requirements/banktransfer.txt b/src/requirements/banktransfer.txt index c60139b830..9bbf199d32 100644 --- a/src/requirements/banktransfer.txt +++ b/src/requirements/banktransfer.txt @@ -1,2 +1,2 @@ -chardet +chardet>=2.3,<3 diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt index 2f51e53d24..1b891edfb0 100644 --- a/src/requirements/dev.txt +++ b/src/requirements/dev.txt @@ -1 +1 @@ -django-debug-toolbar>=1.3.0 +django-debug-toolbar>=1.3.0,<2.0 diff --git a/src/requirements/paypal.txt b/src/requirements/paypal.txt index 19b7672089..5bf92ed3b6 100644 --- a/src/requirements/paypal.txt +++ b/src/requirements/paypal.txt @@ -1,2 +1,2 @@ -paypalrestsdk +paypalrestsdk>=1.9,<1.10,<2.0 diff --git a/src/requirements/production.txt b/src/requirements/production.txt index dc61324746..46b6d34eb7 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -1,12 +1,12 @@ # Functional requirements Django==1.8.1 -python-dateutil +python-dateutil>=2.4,<2.5 pytz -django-bootstrap3 +django-bootstrap3>=5.4,<5.5 -e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js -e git+https://github.com/pretix/cleanerversion.git@pretix#egg=cleanerversion -django-compressor -reportlab +django-compressor>=1.5,<2.0 +reportlab>=3.1.44,<3.2 -e git+https://github.com/pretix/PyPDF2.git@pretix#egg=PyPDF2 # Deployment / static file compilation requirements @@ -14,4 +14,4 @@ BeautifulSoup4 html5lib slimit lxml -dj-static +dj-static==0.0.6 diff --git a/src/requirements/stripe.txt b/src/requirements/stripe.txt index 599f08002d..51f26a42aa 100644 --- a/src/requirements/stripe.txt +++ b/src/requirements/stripe.txt @@ -1,2 +1,2 @@ -stripe +stripe>=1.22,<1.23