Browse Source

Update hacking version

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

Change-Id: I5dcd4320619c7015dc826c6d39bfe74524dbc8c6
jacky06 3 months ago
parent
commit
12cfaf73d8
3 changed files with 9 additions and 8 deletions
  1. 5
    5
      octavia_dashboard/tests/settings.py
  2. 1
    1
      test-requirements.txt
  3. 3
    2
      tox.ini

+ 5
- 5
octavia_dashboard/tests/settings.py View File

@@ -16,16 +16,16 @@
16 16
 from horizon.test.settings import *  # noqa
17 17
 from 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
21
-HORIZON_CONFIG.pop('dashboards', None)
22
-HORIZON_CONFIG.pop('default_dashboard', None)
23
-
24 19
 # Update the dashboards with octavia_dashboard
25 20
 import octavia_dashboard.enabled
26 21
 import openstack_dashboard.enabled
27 22
 from openstack_dashboard.utils import settings
28 23
 
24
+# pop these keys to avoid log warnings about deprecation
25
+# update_dashboards will populate them anyway
26
+HORIZON_CONFIG.pop('dashboards', None)
27
+HORIZON_CONFIG.pop('default_dashboard', None)
28
+
29 29
 settings.update_dashboards(
30 30
     [
31 31
         octavia_dashboard.enabled,

+ 1
- 1
test-requirements.txt View File

@@ -2,7 +2,7 @@
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4 4
 
5
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
5
+hacking>=1.1.0,<1.2.0 # Apache-2.0
6 6
 coverage!=4.4,>=4.0 # Apache-2.0
7 7
 selenium>=2.50.1 # Apache-2.0
8 8
 oslotest>=3.2.0 # Apache-2.0

+ 3
- 2
tox.ini View File

@@ -76,9 +76,10 @@ commands = npm install
76 76
 
77 77
 [flake8]
78 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)
80 81
 show-source = True
81
-ignore = E123,E125
82
+ignore = E123,E125,F405
82 83
 builtins = _
83 84
 exclude=.venv,.git,.tox,.tmp,dist,doc,*lib/python*,*egg,build,node_modules
84 85
 

Loading…
Cancel
Save