Merge "Bump hacking to 0.9.x series"

diskimage_builder/__init__.py

@@ -1,17 +0,0 @@
-# Copyright 2012 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-
-# conceptually load_tests should be here, but see
-# http://bugs.python.org/issue16662 instead, its in test_elements.py

diskimage_builder/tests/test_elements.py

@@ -40,7 +40,7 @@ def load_tests(loader, tests, pattern):
         element_dir = os.path.join(elements_dir, element)
         tests_path = os.path.join(element_dir, "tests")
         if (not os.path.isdir(tests_path) or
-            not os.path.isfile(os.path.join(tests_path, '__init__.py'))):
+                not os.path.isfile(os.path.join(tests_path, '__init__.py'))):
             continue
         # Create a 'package' for the element, so it can be imported.
         package = StubPackage()

test-requirements.txt

@@ -1,4 +1,4 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.2,<0.10
 
 coverage>=3.6
 discover