Changes to support mock driver use in tox

requirements.txt

@@ -1 +1,3 @@
--e .
+-e ".[full]"
+# Hack to install out patched version of moto until/if our pull gets upstream
+git+git://github.com/gvlproject/moto.git@0b3ad166c05b497d026d3168698f07c303e49392

setup.py

@@ -1,11 +1,5 @@
-import sys
 from setuptools import setup, find_packages
 
-if sys.version_info[0] == 2:
-    backports = ["py2-ipaddress"]
-else:
-    backports = []
-
 setup(name='cloudbridge',
       version=0.1,
       description='A simple layer of abstraction over multiple cloud'
@@ -14,12 +8,16 @@ setup(name='cloudbridge',
       author_email='support@genome.edu.au',
       url='http://cloudbridge.readthedocs.org/',
       install_requires=[
-          'bunch>=1.00', 'six>=1.9.0', 'python-keystoneclient',
-          'python-novaclient', 'python-cinderclient',
-          'python-swiftclient', 'boto', 'retrying', 'moto>=0.4.15'] + backports,
-      dependency_links=[
-          "git+git://github.com/gvlproject/moto.git@1.4.15#egg=moto-1.4.15"
-      ],
+          'bunch>=1.00', 'six>=1.9.0', 'retrying'],
+      extras_require={
+          ':python_version=="2.7"': ['py2-ipaddress'],
+          ':python_version=="3"': ['py2-ipaddress'],
+          ':python_version=="3.1"': ['py2-ipaddress'],
+          ':python_version=="3.2"': ['py2-ipaddress'],
+          'full': ['python-keystoneclient',
+                   'python-novaclient', 'python-cinderclient',
+                   'python-swiftclient', 'boto'],
+      },
       packages=find_packages(),
       license='MIT',
       classifiers=[

tox.ini

@@ -9,9 +9,11 @@ envlist = py27, py33, py34, pypy
 [testenv]
 commands = {envpython} setup.py test
 passenv = AWS_ACCESS_KEY AWS_SECRET_KEY OS_AUTH_URL OS_PASSWORD OS_TENANT_NAME OS_USERNAME OS_REGION_NAME NOVA_SERVICE_NAME CB_IMAGE_AWS CB_INSTANCE_TYPE_AWS CB_PLACEMENT_AWS CB_IMAGE_OS CB_INSTANCE_TYPE_OS CB_PLACEMENT_OS CB_TEST_PROVIDER CB_USE_MOCK_DRIVERS
+deps = -rrequirements.txt
 
 # Run coverage for python27 - omit interfaces.py since it's a behaviour spec only.
 [testenv:py27]
 commands = {envpython} -m coverage run --branch --source=cloudbridge --omit=cloudbridge/providers/interfaces/* setup.py test
 deps =
+    -rrequirements.txt
     coverage