Unpin flake8, fix lint

Change-Id: Id899936da7721fcc359e63db455a5349603fe559

actions/openstack_upgrade.py

@@ -57,5 +57,6 @@ def openstack_upgrade():
                                     register_configs())):
         config_changed()
 
+
 if __name__ == '__main__':
     openstack_upgrade()

actions/security_checklist.py

@@ -128,5 +128,6 @@ def main():
     }
     return audits.action_parse_results(audits.run(config))
 
+
 if __name__ == "__main__":
     sys.exit(main())

hooks/glance_utils.py

@@ -150,6 +150,7 @@ REQUIRED_INTERFACES = {
 def ceph_config_file():
     return CHARM_CEPH_CONF.format(service_name())
 
+
 CONFIG_FILES = OrderedDict([
     (GLANCE_REGISTRY_CONF, {
         'hook_contexts': [context.SharedDBContext(ssl_dir=GLANCE_CONF_DIR),
@@ -475,7 +476,7 @@ def check_optional_relations(configs):
     if relation_ids('ha'):
         try:
             get_hacluster_config()
-        except:
+        except Exception:
             return ('blocked',
                     'hacluster missing configuration: '
                     'vip, vip_iface, vip_cidr')

test-requirements.txt

@@ -10,7 +10,7 @@
 charm-tools>=2.4.4
 requests>=2.18.4
 mock>=1.2
-flake8>=2.2.4,<=2.4.1
+flake8>=2.2.4
 stestr>=2.2.0
 coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)

tox.ini

@@ -116,5 +116,5 @@ commands =
     functest-run-suite --keep-model --bundle {posargs}
 
 [flake8]
-ignore = E402,E226
+ignore = E402,E226,W504
 exclude = */charmhelpers