Clean up requirements, update infra

README.md

@@ -13,3 +13,16 @@ or
 ```
 PYTHONPATH=. uwsgi --http :8443 --virtualenv ./runtime --master --wsgi-file bin/api.wsgi
 ```
+
+
+### Maintenance
+
+#### Upgrading Python Packages
+
+List outdated packages
+```
+pip list --local --outdated
+```
+
+Then review and decide what upgrades to make, if any.<br>
+Changes to `requirements.txt` should always be a pull request.

api/base.py

@@ -54,7 +54,7 @@ def __init__(self, request=None, response=None):
                     log.debug('looked up remote token in %dms' % ((datetime.datetime.utcnow() - request_start).total_seconds() * 1000.))
 
                     # Set user's auth provider avatar
-                    # TODO: after api starts reading toml config, switch on auth.provider rather than manually comparing endpoint URL.
+                    # TODO: switch on auth.provider rather than manually comparing endpoint URL.
                     if config.get_item('auth', 'id_endpoint') == 'https://www.googleapis.com/plus/v1/people/me/openIdConnect':
                         provider_avatar = identity.get('picture', '')
                         # Remove attached size param from URL.

bin/install.sh

@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-(
+set -e
+
+unset CDPATH
 cd "$( dirname "${BASH_SOURCE[0]}" )/.."
+
 pip install -r requirements.txt
-)
+pip install -r requirements_dev.txt

bin/run.sh

@@ -102,7 +102,7 @@ echo "Activating Virtualenv"
 source $SCITRAN_RUNTIME_PATH/bin/activate
 
 echo "Installing Python requirements"
-pip install -U -r requirements.txt
+bin/install.sh
 
 
 # Launch mongod

requirements.txt

@@ -1,21 +1,11 @@
-jsonschema
-markdown
-paste
-pylint
-pymongo
-pyopenssl
-python-dateutil
-pytz
-requests
-tzlocal
-webapp2
-webob
-rfc3987
-nose
-toml
-PasteScript
-pytest
-pytest-cov
-pytest-watch
-coverage
-coveralls
+# Production packages
+jsonschema==2.5.1
+Markdown==2.6.5
+pymongo==3.2
+pyOpenSSL==0.15.1
+python-dateutil==2.4.2
+pytz==2015.7
+requests==2.9.1
+rfc3987==1.3.4
+webapp2==2.5.2
+WebOb==1.5.1

requirements_dev.txt

@@ -0,0 +1,9 @@
+# Development packages
+coverage==4.0.3
+coveralls==1.1
+nose==1.3.7
+PasteScript==2.0.2
+pylint==1.5.3
+pytest==2.8.5
+pytest-cov==2.2.0
+pytest-watch==3.8.0