Changed py34 to py35. Made coverage run on all builds. Removed enum34.

cloudbridge/cloud/providers/openstack/impl.py

@@ -129,7 +129,8 @@ class OpenStackCloudProvider(BaseCloudProvider):
 
     def _connect_neutron(self):
         """
-        Get an OpenStack Neutron (networking) client object for the given cloud.
+        Get an OpenStack Neutron (networking) client object for the given
+        cloud.
         """
         return neutron_client.Client(
             username=self.username, password=self.password,

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-base_reqs = ['bunch>=1.00', 'six>=1.9.0', 'retrying', 'enum34']
+base_reqs = ['bunch>=1.00', 'six>=1.9.0', 'retrying']
 openstack_reqs = ['python-keystoneclient',
                   'python-novaclient', 'python-cinderclient',
                   'python-swiftclient', 'python-neutronclient']

tox.ini

@@ -4,16 +4,11 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, pypy
+envlist = py27, py35, 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/cloud/interfaces/* 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
-    coverage
+    coverage