Fix tox and test stuff

run_tests.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Wrap tox to force it to enable global site-packages until
+# https://bitbucket.org/hpk42/tox/issue/32 is released.
+
+set -x
+
+rm -rf cover
+if [ ! -z "$VIRTUAL_ENV" ]
+then
+    rm -f $VIRTUAL_ENV/lib/python*/no-global-site-packages.txt
+fi
+
+nosetests "$@"
+

setup.py

@@ -26,6 +26,7 @@ tests_require = common_setup.parse_requirements(['tools/test-requires'])
 setup_require = common_setup.parse_requirements(['tools/setup-requires'])
 dependency_links = common_setup.parse_dependency_links([
     'tools/pip-requires',
+    'tools/pip-options',
     'tools/test-requires',
     'tools/setup-requires'
 ])

tools/pip-options

@@ -0,0 +1,6 @@
+# Optional Stuff that is used by default
+SQLAlchemy>=0.7.8,<=0.7.9
+kombu
+
+# Needed for Keystone Middleware
+https://launchpad.net/keystone/folsom/2012.2/+download/keystone-2012.2.tar.gz#egg=keystone

tools/pip-requires

@@ -1,13 +1,14 @@
 Flask==0.9
-iso8601>=0.1.4
 eventlet
-sqlalchemy>=0.7
 jsonschema>=0.6
+sqlalchemy>=0.7
 PasteDeploy
+stevedore
+
+routes>=1.12.3
+iso8601>=0.1.4
+WebOb>=1.0.8
 
 # Needed for Keystone Middleware
 https://launchpad.net/keystone/folsom/2012.2/+download/keystone-2012.2.tar.gz#egg=keystone
 python-keystoneclient
-
-# Optional Stuff that is used by default
-kombu