diff --git a/.coveragerc b/.coveragerc index 9f8bb6ae..e35ae828 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,4 @@ [run] -branch = True source = {{ project_name }} omit = *config* diff --git a/.gitignore b/.gitignore index 5e18bb5e..7599ca00 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ node_modules # Logs and databases # ###################### *.db +*.rdb *.log *.log.* *.sql diff --git a/Procfile b/Procfile index dee3f236..30c60a89 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,3 @@ web: gunicorn config.wsgi --workers $WEB_CONCURRENCY --pythonpath $PYTHONPATH -worker: python -u {{ project_name }}/config/worker.py +worker: django-admin.py rqworker high default low +scheduler: rqscheduler --url $REDISCLOUD_URL diff --git a/Procfile.dev b/Procfile.dev index 6f8f17bf..eb8b172a 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,3 +1,4 @@ web: django-admin.py runserver_plus -worker: python -u {{ project_name }}/config/worker.py +worker: django-admin.py rqworker high default low grunt: grunt dev +scheduler: rqscheduler diff --git a/Procfile.test b/Procfile.test index aa90c666..0b3c27e0 100644 --- a/Procfile.test +++ b/Procfile.test @@ -1 +1,3 @@ test: grunt test +worker: django-admin.py rqworker high default low +scheduler: rqscheduler diff --git a/requirements.txt b/requirements.txt index 0feb5a0e..563d6847 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ # This file is here because many Platforms as a Service look for # requirements.txt in the root directory of a project. --r requirements/production.txt +-r requirements/prod.txt diff --git a/requirements/base.txt b/requirements/base.txt index 85aee072..7afb8def 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,7 +2,7 @@ # Current framework # https://docs.djangoproject.com/en/1.7/ -Django==1.7 +Django==1.7.1 # Advanced python interpreter/REPL # http://docs.bpython-interpreter.org/ @@ -44,6 +44,10 @@ django-pipeline==1.3.25 # https://django-redis.readthedocs.org/en/latest/ django-redis==3.7.1 +# https://github.com/ui/django-rq +# Django integration for RQ +django-rq==0.7.0 + # Nifty handlers for the Python standard library’s logging package # https://pythonhosted.org/logutils/ logutils==0.3.3 @@ -68,9 +72,13 @@ pytz==2014.4 # http://docs.python-requests.org/en/latest/ requests==2.4.0 -# Background tasks using redis as queue -# http://python-rq.org/ -rq==0.4.6 +# Job scheduling capabilities to RQ +# https://github.com/ui/rq-scheduler +rq-scheduler==0.5.0 + +# Python 2 and 3 compatibility utilities +# http://pythonhosted.org/six/ +six==1.8.0 # Serves static and dynamic content # https://github.com/lukearno/static diff --git a/requirements/local.txt b/requirements/dev.txt similarity index 100% rename from requirements/local.txt rename to requirements/dev.txt diff --git a/requirements/production.txt b/requirements/prod.txt similarity index 100% rename from requirements/production.txt rename to requirements/prod.txt