Minor tweaks to the code to support the labels merge from @whitmo

- Corrected some initial linting issues w/ setup.py
- Updated tests/10-deploy-test to properly validate a docker upgrade when
using latest=true, as the metapacakge is no longer whats used so we can
tightly control the version of docker deployed across multiple hosts.

hooks/setup.py

@@ -8,17 +8,17 @@ def pre_install():
     Do any setup required before the install hook.
     """
     try:
-        import charmhelpers # noqa
-        import ansiblecharm # noqa
-        from path import path # noqa
+        import charmhelpers  # noqa
+        import ansiblecharm  # noqa
+        from path import path  # noqa
     except ImportError:
         subprocess.check_call(['hooks/setup.sh'])
         subprocess.check_call("pip install -r hooks/python-pkgs.txt",
                               shell=True)
 
         from path import path
 
-        #temporary dev hack
+        # temporary dev hack
         for lib in ('src/ansiblecharm', 'src/charmhelpers'):
             pth = str(path(os.environ['CHARM_DIR']) / lib)
             sys.path.append(pth)

tests/10-deploy-test

@@ -65,9 +65,10 @@ class TestDeployment(unittest.TestCase):
 
     def test_latest_config_option(self):
         """ Set config option to latest and verify docker is installed """
-        self.deployment.configure('docker', {'latest': True})
+        self.deployment.configure('docker', {'latest': True,
+                                             'version': '1.5.0'})
         self.deployment.sentry.wait()
-        command = 'dpkg -l lxc-docker'
+        command = 'dpkg -l lxc-docker-1.5.0'
         output, code = self.docker_unit.run(command)
         print(output)
         if output.find('ii') == -1: