updated requirements and Procfile

briangrace · Oct 22, 2014 · 368a1f0 · 368a1f0
1 parent ca87098
commit 368a1f0
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 8 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,4 @@
 [run]
-branch = True
 source = {{ project_name }}
 omit =
     *config*

diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@ node_modules
 # Logs and databases #
 ######################
 *.db
+*.rdb
 *.log
 *.log.*
 *.sql

diff --git 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
@@ -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
@@ -1 +1,3 @@
 test: grunt test
+worker: django-admin.py rqworker high default low
+scheduler: rqscheduler
diff --git 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
@@ -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 → requirements/dev.txt b/requirements/local.txt → requirements/dev.txt
diff --git a/requirements/production.txt → requirements/prod.txt b/requirements/production.txt → requirements/prod.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ node_modules @@
     # Logs and databases #
     ######################
     *.db
+    *.rdb
     *.log
     *.log.*
     *.sql
@@ Expand Down @@