Bump hacking to 0.9.x series

Change-Id: I0547e6eea4fc5000275ebe19fe60d6f53670cc7a

os_cloud_config/cmd/setup_endpoints.py

@@ -13,9 +13,9 @@
 
 import argparse
 import os
-import simplejson
 import textwrap
 
+import simplejson
 
 from os_cloud_config.cmd.utils import _clients
 from os_cloud_config.cmd.utils import environment

os_cloud_config/cmd/tests/test_init_keystone.py

@@ -25,8 +25,8 @@ class InitKeystoneTest(base.TestCase):
 
     @mock.patch('os_cloud_config.cmd.init_keystone.initialize')
     @mock.patch.object(sys, 'argv', ['init-keystone', '-o', 'hostname', '-t',
-                       'token', '-e', 'admin@example.com', '-p', 'password',
+                                     'token', '-e', 'admin@example.com', '-p',
-                       '-u', 'root'])
+                                     'password', '-u', 'root'])
     def test_script(self, initialize_mock):
         init_keystone.main()
         initialize_mock.assert_called_once_with(

os_cloud_config/cmd/tests/test_setup_endpoints.py

@@ -11,9 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import sys
 
+import mock
+
 from os_cloud_config.cmd import setup_endpoints
 from os_cloud_config.tests import base
 
@@ -27,7 +28,8 @@ class SetupEndpointsTest(base.TestCase):
         sys, 'argv',
         ['setup-endpoints', '-s', '{"nova": {"password": "123"}}',
          '-p', '192.0.2.28', '-r', 'EC'])
-    @mock.patch.dict('os.environ', {'OS_USERNAME': 'admin',
+    @mock.patch.dict('os.environ', {
+                     'OS_USERNAME': 'admin',
                      'OS_PASSWORD': 'password',
                      'OS_TENANT_NAME': 'admin',
                      'OS_AUTH_URL': 'http://localhost:5000'})

os_cloud_config/keystone.py

@@ -15,12 +15,13 @@
 from __future__ import print_function
 
 import logging
-from six.moves.urllib.parse import urlparse
 import subprocess
 import time
 
 from keystoneclient.openstack.common.apiclient import exceptions
 import keystoneclient.v2_0.client as ksclient
+from six.moves.urllib.parse import urlparse
+
 from os_cloud_config.utils import clients
 
 LOG = logging.getLogger(__name__)

os_cloud_config/nodes.py

@@ -18,9 +18,10 @@ import time
 
 from ironicclient.openstack.common.apiclient import exceptions as ironicexp
 from novaclient.openstack.common.apiclient import exceptions as novaexc
-from os_cloud_config.cmd.utils import _clients as clients
 import six
 
+from os_cloud_config.cmd.utils import _clients as clients
+
 LOG = logging.getLogger(__name__)
 
 

os_cloud_config/tests/__init__.py

@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.

os_cloud_config/tests/test_keystone.py

@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from keystoneclient.openstack.common.apiclient import exceptions
 import keystoneclient.v2_0.client as ksclient
 import mock
 
-from keystoneclient.openstack.common.apiclient import exceptions
 from os_cloud_config import keystone
 from os_cloud_config.tests import base
 

os_cloud_config/tests/test_nodes.py

@@ -15,11 +15,11 @@
 
 import collections
 
+from ironicclient.openstack.common.apiclient import exceptions as ironicexp
 import mock
+from novaclient.openstack.common.apiclient import exceptions as novaexc
 from testtools import matchers
 
-from ironicclient.openstack.common.apiclient import exceptions as ironicexp
-from novaclient.openstack.common.apiclient import exceptions as novaexc
 from os_cloud_config import nodes
 from os_cloud_config.tests import base
 
@@ -245,7 +245,7 @@ class NodesTest(base.TestCase):
                 key['op'] = 'replace'
             self.assertThat(update_patch,
                             matchers.MatchesSetwise(*(map(matchers.Equals,
-                            args[1]))))
+                                                          args[1]))))
         ironic.node.update.side_effect = side_effect
         nodes._update_or_register_ironic_node(None, node, node_map,
                                               client=ironic)
@@ -298,7 +298,7 @@ class NodesTest(base.TestCase):
                 key['op'] = 'replace'
             self.assertThat(update_patch,
                             matchers.MatchesSetwise(*(map(matchers.Equals,
-                            args[1]))))
+                                                      args[1]))))
         ironic.node.update.side_effect = side_effect
         nodes._update_or_register_ironic_node(None, node, node_map,
                                               client=ironic)

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.8.0,<0.9
+hacking>=0.9.2,<0.10
 
 coverage>=3.6
 discover