summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacky06 <zhang.min@99cloud.net>2019-01-04 23:26:02 +0800
committerjacky06 <zhang.min@99cloud.net>2019-01-12 11:38:59 +0800
commit12cfaf73d8a317ebbcdb3d27650a688a25a9dfce (patch)
tree72d46f3c799212f8cbe475146bfd8dd61f29be33
parentbae23e09669c2696546012b96d4b65b13a937a44 (diff)
Update hacking version
Use latest release 1.1.0 and compatible changes w.r.t pep8 Change-Id: I5dcd4320619c7015dc826c6d39bfe74524dbc8c6
Notes
Notes (review): Code-Review+1: caoyuan <cao.yuan@99cloud.net> Code-Review+2: Jacky Hu <hudayou@hotmail.com> Code-Review+2: Michael Johnson <johnsomor@gmail.com> Workflow+1: Michael Johnson <johnsomor@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 05 Feb 2019 06:58:50 +0000 Reviewed-on: https://review.openstack.org/628480 Project: openstack/octavia-dashboard Branch: refs/heads/master
-rw-r--r--octavia_dashboard/tests/settings.py10
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini5
3 files changed, 9 insertions, 8 deletions
diff --git a/octavia_dashboard/tests/settings.py b/octavia_dashboard/tests/settings.py
index 41bfa3d..bea18e4 100644
--- a/octavia_dashboard/tests/settings.py
+++ b/octavia_dashboard/tests/settings.py
@@ -16,16 +16,16 @@
16from horizon.test.settings import * # noqa 16from horizon.test.settings import * # noqa
17from openstack_dashboard.test.settings import * # noqa 17from openstack_dashboard.test.settings import * # noqa
18 18
19# pop these keys to avoid log warnings about deprecation
20# update_dashboards will populate them anyway
21HORIZON_CONFIG.pop('dashboards', None)
22HORIZON_CONFIG.pop('default_dashboard', None)
23
24# Update the dashboards with octavia_dashboard 19# Update the dashboards with octavia_dashboard
25import octavia_dashboard.enabled 20import octavia_dashboard.enabled
26import openstack_dashboard.enabled 21import openstack_dashboard.enabled
27from openstack_dashboard.utils import settings 22from openstack_dashboard.utils import settings
28 23
24# pop these keys to avoid log warnings about deprecation
25# update_dashboards will populate them anyway
26HORIZON_CONFIG.pop('dashboards', None)
27HORIZON_CONFIG.pop('default_dashboard', None)
28
29settings.update_dashboards( 29settings.update_dashboards(
30 [ 30 [
31 octavia_dashboard.enabled, 31 octavia_dashboard.enabled,
diff --git a/test-requirements.txt b/test-requirements.txt
index 1942751..123e9ee 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 5hacking>=1.1.0,<1.2.0 # Apache-2.0
6coverage!=4.4,>=4.0 # Apache-2.0 6coverage!=4.4,>=4.0 # Apache-2.0
7selenium>=2.50.1 # Apache-2.0 7selenium>=2.50.1 # Apache-2.0
8oslotest>=3.2.0 # Apache-2.0 8oslotest>=3.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 06ac299..972c7b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,9 +76,10 @@ commands = npm install
76 76
77[flake8] 77[flake8]
78# E123, E125 skipped as they are invalid PEP-8. 78# E123, E125 skipped as they are invalid PEP-8.
79 79# F405 TEMPLATES may be undefined, or defined from star imports
80# (because it is not easy to avoid this in openstack_dashboard.test.settings)
80show-source = True 81show-source = True
81ignore = E123,E125 82ignore = E123,E125,F405
82builtins = _ 83builtins = _
83exclude=.venv,.git,.tox,.tmp,dist,doc,*lib/python*,*egg,build,node_modules 84exclude=.venv,.git,.tox,.tmp,dist,doc,*lib/python*,*egg,build,node_modules
84 85