Bump hacking

hacking 3.1.x is too old.

Change-Id: I40369a5eef87cb6a356e059e005eb417ec67bb84

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
       - id: flake8
         name: flake8
         additional_dependencies:
-          - hacking>=3.0.1,<3.1.0
+          - hacking>=6.1.0,<6.2.0
         language: python
         entry: flake8
         files: '^.*\.py$'

oslo_versionedobjects/tests/test_fields.py

@@ -223,7 +223,8 @@ class TestMACAddress(TestField):
         pattern = schema['pattern']
         for _, valid_val in self.coerce_good_values:
             self.assertRegex(valid_val, pattern)
-        invalid_vals = [x for x in self.coerce_bad_values if type(x) == 'str']
+        invalid_vals = [x for x in self.coerce_bad_values
+                        if isinstance(x, str)]
         for invalid_val in invalid_vals:
             self.assertNotRegex(invalid_val, pattern)
 
@@ -255,7 +256,8 @@ class TestPCIAddress(TestField):
         pattern = schema['pattern']
         for _, valid_val in self.coerce_good_values:
             self.assertRegex(valid_val, pattern)
-        invalid_vals = [x for x in self.coerce_bad_values if type(x) == 'str']
+        invalid_vals = [x for x in self.coerce_bad_values
+                        if isinstance(x, str)]
         for invalid_val in invalid_vals:
             self.assertNotRegex(invalid_val, pattern)
 
@@ -312,7 +314,8 @@ class TestUUID(TestField):
         pattern = schema['pattern']
         for _, valid_val in self.coerce_good_values[:4]:
             self.assertRegex(valid_val, pattern)
-        invalid_vals = [x for x in self.coerce_bad_values if type(x) == 'str']
+        invalid_vals = [x for x in self.coerce_bad_values
+                        if isinstance(x, str)]
         for invalid_val in invalid_vals:
             self.assertNotRegex(invalid_val, pattern)
 

requirements.txt

@@ -1,6 +1,3 @@
-# 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.
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0

test-requirements.txt

@@ -1,7 +1,4 @@
-# The order of packages is significant, because pip processes them in the order
+hacking>=6.1.0,<6.2.0 # Apache-2.0
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-hacking>=3.1.0,<3.2.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 coverage!=4.4,>=4.0 # Apache-2.0