Browse Source

Merge "Update hacking version"

Zuul 1 month ago
parent
commit
9fb535371e

+ 1
- 1
HACKING.rst View File

@@ -1,4 +1,4 @@
1 1
 oslo.reports Style Commandments
2
-======================================================
2
+===============================
3 3
 
4 4
 Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/

+ 5
- 5
oslo_reports/opts.py View File

@@ -10,17 +10,17 @@
10 10
 #    License for the specific language governing permissions and limitations
11 11
 #    under the License.
12 12
 
13
-__all__ = [
14
-    'list_opts',
15
-    'set_defaults',
16
-]
17
-
18 13
 import copy
19 14
 
20 15
 from oslo_config import cfg
21 16
 
22 17
 from oslo_reports._i18n import _
23 18
 
19
+__all__ = [
20
+    'list_opts',
21
+    'set_defaults',
22
+]
23
+
24 24
 
25 25
 _option_group = 'oslo_reports'
26 26
 

+ 2
- 2
oslo_reports/tests/test_guru_meditation_report.py View File

@@ -52,8 +52,8 @@ class FakeVersionObj(object):
52 52
 
53 53
 def skip_body_lines(start_line, report_lines):
54 54
     curr_line = start_line
55
-    while (len(report_lines[curr_line]) == 0
56
-           or report_lines[curr_line][0] != '='):
55
+    while (len(report_lines[curr_line]) == 0 or
56
+           report_lines[curr_line][0] != '='):
57 57
         curr_line += 1
58 58
 
59 59
     return curr_line

+ 2
- 2
oslo_reports/views/xml/generic.py View File

@@ -68,8 +68,8 @@ class KeyValueView(object):
68 68
             if isinstance(rootmodel, col.Mapping):
69 69
                 for key in sorted(rootmodel):
70 70
                     res.append(serialize(rootmodel[key], key))
71
-            elif (isinstance(rootmodel, col.Sequence)
72
-                    and not isinstance(rootmodel, six.string_types)):
71
+            elif (isinstance(rootmodel, col.Sequence) and
72
+                    not isinstance(rootmodel, six.string_types)):
73 73
                 for val in sorted(rootmodel, key=str):
74 74
                     res.append(serialize(val, 'item'))
75 75
             elif ET.iselement(rootmodel):

+ 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
 oslotest>=3.2.0 # Apache-2.0
7 7
 stestr>=2.0.0 # Apache-2.0
8 8
 

Loading…
Cancel
Save