Merge remote-tracking branch 'starlingx/master' into HEAD

Change-Id: I3b334b4eabc4d90d3e080870416b2a8be68855a6
Signed-off-by: Scott Little <scott.little@windriver.com>

tox.ini

@@ -23,19 +23,24 @@ commands =
          -name \*.sh                          \
          -print0 | xargs -0 bashate -iE006 -v"
   bash -c "find {toxinidir}        \
-            \( -name middleware/io-monitor/recipes-common/io-monitor/io-monitor/io_monitor/test-tools/yaml/* -prune \) \
-            -o \( -name .tox -prune \)         \
+            \( -name .tox -prune \)         \
             -o -type f -name '*.yaml'       \
             -print0 | xargs -0 yamllint"
 
+[flake8]
+exclude=.tox
+# H102 Apache 2.0 license header not found
+ignore=H102
+
 [testenv:pep8]
 basepython = python3
 usedevelop = False
 skip_install = True
+# hacking pins the version of flake8
 deps =
-    pep8
+    hacking!=0.13.0,<0.14,>=0.12.0 
 commands =
-    pep8
+    flake8
 
 [testenv:venv]
 basepython = python3