Incorrect version for hacking package on stable/kilo

python-cinderclient should follow global requirements because
we have hacking>=0.10.0,<0.11 in global requirements and
hacking>=0.8.0,<0.9 in python-cinderclient in stable/kilo.
It causes issues with packaging and conflicts in stable/kilo env.
It updates from global-requirements change:
I3e0e288974d6497481d6ea2d1b1a74b0cebe3ec7

Closes-Bug: #1475654
Change-Id: Ia7e5cae5e32f68c8552e16755ec139488d893c27

cinderclient/shell.py

@@ -160,7 +160,8 @@ class OpenStackCinderShell(object):
 
         parser.add_argument('--endpoint-type',
                             metavar='<endpoint-type>',
-                            default=utils.env('CINDER_ENDPOINT_TYPE',
+                            default=utils.env(
+                                'CINDER_ENDPOINT_TYPE',
                                 default=DEFAULT_CINDER_ENDPOINT_TYPE),
                             help='Endpoint type, which is publicURL or '
                             'internalURL. '

cinderclient/tests/v1/fakes.py

@@ -448,17 +448,20 @@ class FakeHTTPClient(base_client.HTTPClient):
                               'extra_specs': {}}]})
 
     def get_types_1(self, **kw):
-        return (200, {}, {'volume_type': {'id': 1,
+        return (200, {}, {
+            'volume_type': {'id': 1,
                             'name': 'test-type-1',
                             'extra_specs': {}}})
 
     def get_types_2(self, **kw):
-        return (200, {}, {'volume_type': {'id': 2,
+        return (200, {}, {
+            'volume_type': {'id': 2,
                             'name': 'test-type-2',
                             'extra_specs': {}}})
 
     def post_types(self, body, **kw):
-        return (202, {}, {'volume_type': {'id': 3,
+        return (202, {}, {
+            'volume_type': {'id': 3,
                             'name': 'test-type-3',
                             'extra_specs': {}}})
 

cinderclient/tests/v1/test_shell.py

@@ -79,7 +79,7 @@ class ShellTest(utils.TestCase):
 
     def test_extract_metadata(self):
         # mimic the result of argparse's parse_args() method
-        class Arguments:
+        class Arguments(object):
 
             def __init__(self, metadata=[]):
                 self.metadata = metadata

cinderclient/tests/v2/fakes.py

@@ -530,17 +530,20 @@ class FakeHTTPClient(base_client.HTTPClient):
                               'extra_specs': {}}]})
 
     def get_types_1(self, **kw):
-        return (200, {}, {'volume_type': {'id': 1,
+        return (200, {}, {
+            'volume_type': {'id': 1,
                             'name': 'test-type-1',
                             'extra_specs': {}}})
 
     def get_types_2(self, **kw):
-        return (200, {}, {'volume_type': {'id': 2,
+        return (200, {}, {
+            'volume_type': {'id': 2,
                             'name': 'test-type-2',
                             'extra_specs': {}}})
 
     def post_types(self, body, **kw):
-        return (202, {}, {'volume_type': {'id': 3,
+        return (202, {}, {
+            'volume_type': {'id': 3,
                             'name': 'test-type-3',
                             'extra_specs': {}}})
 

cinderclient/v1/volume_types.py

@@ -68,8 +68,7 @@ class VolumeType(base.Resource):
         resp = None
         for k in keys:
             resp = self.manager._delete(
-                "/types/%s/extra_specs/%s" % (
-                base.getid(self), k))
+                "/types/%s/extra_specs/%s" % (base.getid(self), k))
             if resp is not None:
                 return resp
 

cinderclient/v2/shell.py

@@ -650,8 +650,7 @@ def do_snapshot_rename(cs, args):
            default='available',
            help=('The state to assign to the snapshot. Valid values are '
                  '"available," "error," "creating," "deleting," and '
-           '"error_deleting." '
-           'Default is "available."'))
+                 '"error_deleting." Default is "available."'))
 @utils.service_type('volumev2')
 def do_snapshot_reset_state(cs, args):
     """Explicitly updates the snapshot state."""

cinderclient/v2/volume_types.py

@@ -60,8 +60,7 @@ class VolumeType(base.Resource):
         # and return if there's an error
         for k in keys:
             resp = self.manager._delete(
-                "/types/%s/extra_specs/%s" % (
-                base.getid(self), k))
+                "/types/%s/extra_specs/%s" % (base.getid(self), k))
             if resp is not None:
                 return resp
 

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 already pins down pep8, pyflakes and flake8
-hacking<0.9,>=0.8.0
+hacking>=0.10.0,<0.11
 coverage>=3.6
 discover
 fixtures>=0.3.14

tox.ini

@@ -31,5 +31,5 @@ downloadcache = ~/cache/pip
 
 [flake8]
 show-source = True
-ignore = F811,F821,H302,H306,H404
+ignore = F811,F821,H302,H306,H404,H405
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools