add requirements for tests and tweak how the secret key gets set

pegler · Feb 5, 2014 · 401ac58 · 401ac58
1 parent 9fc41e1
commit 401ac58
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/requirements.txt → requirements/live.txt b/requirements.txt → requirements/live.txt
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -1,11 +1,31 @@
+requests==2.0.1
 flake8==2.1.0
 coverage==3.7
 coveralls==0.3
+argparse==1.2.1
+nose==1.3.0
+APScheduler==2.1.2
 Flask==0.10.1
+Flask-GoogleAuth==0.4
 Flask-SQLAlchemy==1.0
-nose==1.3.0
-argparse==1.2.1
-tornado==3.1.1
-APScheduler==2.1.1
-Flask-WTF==0.9.3
-requests==2.0.1
+Flask-WTF==0.9.4
+Jinja2==2.7.2
+MarkupSafe==0.18
+SQLAlchemy==0.9.1
+SQLAlchemy-Utils==0.23.3
+WTForms==1.0.5
+WTForms-Alchemy==0.12.0
+WTForms-Components==0.9.1
+Werkzeug==0.9.4
+backports.ssl-match-hostname==3.4.0.2
+blinker==1.3
+decorator==3.4.0
+infinity==1.3
+intervals==0.2.0
+itsdangerous==0.23
+requests==2.2.1
+six==1.5.2
+toolz==0.5.2
+tornado==3.2
+validators==0.5.0
+wsgiref==0.1.2
diff --git a/revere/__init__.py b/revere/__init__.py
@@ -23,7 +23,7 @@
 if google_apps_domain:
     auth = GoogleFederated(google_apps_domain, app)
     app.wsgi_app = ProxyFix(app.wsgi_app)
-    app.secret_key = app.config.get('COOKIE_SECRET')
+    app.secret_key = app.config.get('SECRET_KEY') or app.config.get('COOKIE_SECRET')
 
     def _force_auth_on_every_request():