From 5242ffbaa2e647e46c9214ff888b0402d25aa697 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Fri, 4 Jan 2019 23:26:17 +0800 Subject: [PATCH] Update hacking version Use latest release 1.1.0 and compatible changes w.r.t pep8 Change-Id: I8ef441f277a1ebb707906e8c159585bac95192d6 --- test-requirements.txt | 2 +- tox.ini | 3 +++ watcher_dashboard/test/settings.py | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index feabb03..c6fb11c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -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 python-subunit>=1.0.0 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index 05b9b9c..b57eb33 100644 --- a/tox.ini +++ b/tox.ini @@ -60,6 +60,9 @@ basepython = python3 commands = oslo_debug_helper {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 show-source = True builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools diff --git a/watcher_dashboard/test/settings.py b/watcher_dashboard/test/settings.py index 28be2ab..2afa104 100644 --- a/watcher_dashboard/test/settings.py +++ b/watcher_dashboard/test/settings.py @@ -14,6 +14,10 @@ from horizon.test.settings import * # noqa from openstack_dashboard.test.settings import * # noqa +# Load the pluggable dashboard settings +import openstack_dashboard.enabled +import watcher_dashboard.local.enabled + INSTALLED_APPS = ( 'django.contrib.contenttypes', 'django.contrib.auth', @@ -27,10 +31,6 @@ INSTALLED_APPS = ( 'openstack_dashboard', ) -# Load the pluggable dashboard settings -import openstack_dashboard.enabled -import watcher_dashboard.local.enabled - INSTALLED_APPS = list(INSTALLED_APPS) # Make sure it's mutable settings_utils.update_dashboards( [