Update hacking version

Use latest release 1.1.0 and compatible changes w.r.t pep8

Change-Id: I4fbccf98e81ba2ce19210101593011ac3de086ac

doc/source/conf.py

@@ -29,6 +29,8 @@ import sys
 
 import django
 
+from magnum_ui import version as magnumui_ver
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
 
@@ -43,8 +45,6 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE',
 # https://docs.djangoproject.com/en/1.8/releases/1.7/#standalone-scripts
 django.setup()
 
-from magnum_ui import version as magnumui_ver
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

magnum_ui/test/api_tests/test_rest_api.py

@@ -58,8 +58,8 @@ class MagnumRestTestCase(test.TestCase):
     def test_cluster_template_delete(self, client):
         test_cluster_template = TEST.cluster_templates.first()
         request = self.mock_rest_request(
-            body='{"cluster_template_id":'
+            body='{"cluster_template_id":' +
-                 + str(test_cluster_template['uuid']) + '}')
+                 str(test_cluster_template['uuid']) + '}')
         response = magnum.ClusterTemplates().delete(request)
 
         self.assertStatusCode(response, 204)

magnum_ui/test/settings.py

@@ -16,16 +16,16 @@
 from horizon.test.settings import *  # noqa: F403,H303
 from openstack_dashboard.test.settings import *  # noqa: F403,H303
 
-# pop these keys to avoid log warnings about deprecation
-# update_dashboards will populate them anyway
-HORIZON_CONFIG.pop('dashboards', None)
-HORIZON_CONFIG.pop('default_dashboard', None)
-
 # Update the dashboards with magnum_ui
 import magnum_ui.enabled
 import openstack_dashboard.enabled
 from openstack_dashboard.utils import settings
 
+# pop these keys to avoid log warnings about deprecation
+# update_dashboards will populate them anyway
+HORIZON_CONFIG.pop('dashboards', None)
+HORIZON_CONFIG.pop('default_dashboard', None)
+
 settings.update_dashboards(
     [
         magnum_ui.enabled,

test-requirements.txt

@@ -7,7 +7,7 @@
 # be installed in a specific order.
 #
 # Hacking should appear first in case something else depends on pep8
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
 nodeenv>=0.9.4 # BSD

tox.ini

@@ -33,6 +33,9 @@ basepython = python3
 commands = flake8 {posargs}
 
 [flake8]
+# F405 TEMPLATES may be undefined, or defined from star imports
+# (because it is not easy to avoid this in openstack_dashboard.test.settings)
+ignore = F405
 exclude = .git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*,.ropeproject,node_modules
 max-complexity = 20