Merge "Update hacking version"

HACKING.rst

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

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/

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,

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