summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-01-25 09:58:25 -0500
committerGitHub <noreply@github.com>2017-01-25 09:58:25 -0500
commit1cfe0439df91c299643e7db4c3dc8a48863d8ee2 (patch)
tree9bec1ff73175f39d350ef6d6423106cea4d7ebce
parentc5a1e1eb9238f33983ade2917805f7da6e87bcb9 (diff)
parentf2bca8e3bc161b350f1423f52a9f36ac29f5f906 (diff)
downloadopenshift-1cfe0439df91c299643e7db4c3dc8a48863d8ee2.tar.gz
openshift-1cfe0439df91c299643e7db4c3dc8a48863d8ee2.tar.bz2
openshift-1cfe0439df91c299643e7db4c3dc8a48863d8ee2.tar.xz
openshift-1cfe0439df91c299643e7db4c3dc8a48863d8ee2.zip
Merge pull request #3177 from mtnbikenc/pipdep-fix
flake8 mccabe dependency fix
-rw-r--r--utils/test-requirements.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/utils/test-requirements.txt b/utils/test-requirements.txt
index aebfe7c39..699afc26a 100644
--- a/utils/test-requirements.txt
+++ b/utils/test-requirements.txt
@@ -1,11 +1,10 @@
ansible
-configparser
-pylint
+# flake8 moved to before setuptools-lint to satisfy mccabe dependency issue
+flake8
setuptools-lint
nose
coverage
mock
-flake8
PyYAML
click
backports.functools_lru_cache
@@ -13,5 +12,3 @@ pyOpenSSL
yamllint
tox
detox
-# Temporary work-around for flake8 vs maccabe version conflict
-mccabe==0.5.3