summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-05 06:58:50 +0000
committerGerrit Code Review <review@openstack.org>2019-02-05 06:58:50 +0000
commit5391d3d5e17439bcba144d66e7ef62664e322769 (patch)
tree88840c5a8a02dea4d10af567d661dd1e3c507d5b
parentad43b1f36c3a1df0c20fc12b1093a35331ed3ecb (diff)
parent12cfaf73d8a317ebbcdb3d27650a688a25a9dfce (diff)
Merge "Update hacking version"
-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