From 8171c03846d167b683ca854dccddb3c6b3f95a96 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Fri, 28 Dec 2018 22:52:08 +0800 Subject: [PATCH] Update hacking version Use latest release 1.1.0 and compatible changes w.r.t pep8 Change-Id: I8c82e52e03b2489aca0b70de761da5ac328c7b9c --- HACKING.rst | 2 +- oslo_reports/opts.py | 10 +++++----- oslo_reports/tests/test_guru_meditation_report.py | 4 ++-- oslo_reports/views/xml/generic.py | 4 ++-- test-requirements.txt | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 3c74ec3..1f8a6b9 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ oslo.reports Style Commandments -====================================================== +=============================== Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff --git a/oslo_reports/opts.py b/oslo_reports/opts.py index 324b7f1..d7c1b5c 100644 --- a/oslo_reports/opts.py +++ b/oslo_reports/opts.py @@ -10,17 +10,17 @@ # License for the specific language governing permissions and limitations # under the License. -__all__ = [ - 'list_opts', - 'set_defaults', -] - import copy from oslo_config import cfg from oslo_reports._i18n import _ +__all__ = [ + 'list_opts', + 'set_defaults', +] + _option_group = 'oslo_reports' diff --git a/oslo_reports/tests/test_guru_meditation_report.py b/oslo_reports/tests/test_guru_meditation_report.py index 0a4f6b3..8cdb26b 100644 --- a/oslo_reports/tests/test_guru_meditation_report.py +++ b/oslo_reports/tests/test_guru_meditation_report.py @@ -52,8 +52,8 @@ class FakeVersionObj(object): def skip_body_lines(start_line, report_lines): curr_line = start_line - while (len(report_lines[curr_line]) == 0 - or report_lines[curr_line][0] != '='): + while (len(report_lines[curr_line]) == 0 or + report_lines[curr_line][0] != '='): curr_line += 1 return curr_line diff --git a/oslo_reports/views/xml/generic.py b/oslo_reports/views/xml/generic.py index 21cac78..20e4323 100644 --- a/oslo_reports/views/xml/generic.py +++ b/oslo_reports/views/xml/generic.py @@ -68,8 +68,8 @@ class KeyValueView(object): if isinstance(rootmodel, col.Mapping): for key in sorted(rootmodel): res.append(serialize(rootmodel[key], key)) - elif (isinstance(rootmodel, col.Sequence) - and not isinstance(rootmodel, six.string_types)): + elif (isinstance(rootmodel, col.Sequence) and + not isinstance(rootmodel, six.string_types)): for val in sorted(rootmodel, key=str): res.append(serialize(val, 'item')) elif ET.iselement(rootmodel): diff --git a/test-requirements.txt b/test-requirements.txt index 26cd198..c2e49e7 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 oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0