From 12cfaf73d8a317ebbcdb3d27650a688a25a9dfce Mon Sep 17 00:00:00 2001 From: jacky06 Date: Fri, 4 Jan 2019 23:26:02 +0800 Subject: [PATCH] Update hacking version Use latest release 1.1.0 and compatible changes w.r.t pep8 Change-Id: I5dcd4320619c7015dc826c6d39bfe74524dbc8c6 --- octavia_dashboard/tests/settings.py | 10 +++++----- test-requirements.txt | 2 +- tox.ini | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/octavia_dashboard/tests/settings.py b/octavia_dashboard/tests/settings.py index 41bfa3d9..bea18e4b 100644 --- a/octavia_dashboard/tests/settings.py +++ b/octavia_dashboard/tests/settings.py @@ -16,16 +16,16 @@ from horizon.test.settings import * # noqa from openstack_dashboard.test.settings import * # noqa -# 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 octavia_dashboard import octavia_dashboard.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( [ octavia_dashboard.enabled, diff --git a/test-requirements.txt b/test-requirements.txt index 19427511..123e9ee5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -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 selenium>=2.50.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 06ac299a..972c7b63 100644 --- a/tox.ini +++ b/tox.ini @@ -76,9 +76,10 @@ commands = npm install [flake8] # E123, E125 skipped as they are invalid PEP-8. - +# F405 TEMPLATES may be undefined, or defined from star imports +# (because it is not easy to avoid this in openstack_dashboard.test.settings) show-source = True -ignore = E123,E125 +ignore = E123,E125,F405 builtins = _ exclude=.venv,.git,.tox,.tmp,dist,doc,*lib/python*,*egg,build,node_modules