Merge "Bump hacking"

Author: Zuul

requirements.txt

@@ -1,7 +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.
-
 pbr!= 2.1.0,>=2.0.0
 Babel>=1.3
 python-cloudkittyclient>=0.5.0

test-requirements.txt

@@ -1,13 +1,4 @@
-# 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>=3.0.1,<3.1.0 # Apache-2.0
-# remove this pyflakes from here once you bump the
-# hacking to 3.2.0 or above. hacking 3.2.0 takes
-# care of pyflakes version compatibilty.
-pyflakes>=2.1.1
-
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 coverage>=3.6
 python-subunit>=0.0.18
 oslotest>=1.10.0 # Apache-2.0