From c9b464c0995788ac52ca4378da6554254e2684e1 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: I95d62bbce7fe20dd2f9ec8a96cdffeeefcda75be --- HACKING.rst | 4 ++-- README.rst | 4 ++-- oslo_serialization/jsonutils.py | 4 ++-- test-requirements.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index fffb3fa..53457b7 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ oslo.serialization Style Commandments -====================================================== +===================================== -Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest \ No newline at end of file +Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest diff --git a/README.rst b/README.rst index 6bca61c..4cb74a8 100644 --- a/README.rst +++ b/README.rst @@ -7,9 +7,9 @@ Team and repository tags .. Change things from this point on -==================== +=================== oslo.serialization -==================== +=================== .. image:: https://img.shields.io/pypi/v/oslo.serialization.svg :target: https://pypi.org/project/oslo.serialization/ diff --git a/oslo_serialization/jsonutils.py b/oslo_serialization/jsonutils.py index 3578f87..aeb884a 100644 --- a/oslo_serialization/jsonutils.py +++ b/oslo_serialization/jsonutils.py @@ -53,8 +53,8 @@ _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod, inspect.iscode, inspect.isbuiltin, inspect.isroutine, inspect.isabstract] -_simple_types = ((six.text_type,) + six.integer_types - + (type(None), bool, float)) +_simple_types = ((six.text_type,) + six.integer_types + + (type(None), bool, float)) def to_primitive(value, convert_instances=False, convert_datetime=True, diff --git a/test-requirements.txt b/test-requirements.txt index e682186..6882afd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # 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 ipaddress>=1.0.17;python_version<'3.3' # PSF mock>=2.0.0 # BSD netaddr>=0.7.18 # BSD