Merge "Revert "Fixed use of flake8""

2019-09-16 05:37:28 +00:00 · 2019-09-16 05:37:28 +00:00 · b907ecf15c
commit b907ecf15c
parent f0dd0bd63a 8c85a7ed5d
2 changed files with 2 additions and 1 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -9,3 +9,5 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 PyYAML>=3.12 # MIT
 six>=1.10.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
+# NOTE(ianw) in here because dib-lint uses flake8
+hacking<1.2.0,>=1.1.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -2,7 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-hacking<1.2.0,>=1.1.0
 pylint==1.7.6;python_version=='2.7' # GPLv2
 pylint;python_version>'3.0' #GPLv2