Updated from global requirements

[functest-xtesting.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index c8312af..98df801 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,bashate,py35,py27,perm,cover
+skipsdist = True
 
 [testenv]
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike
+  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}
@@ -20,7 +21,7 @@ commands = nosetests --with-xunit \
 [testenv:docs]
 basepython = python2.7
 commands =
-  doc8 api --ignore-path api/build
+  doc8 README.rst api --ignore-path api/build
   sphinx-build -W -b html api/ api/build
 
 [testenv:pep8]
@@ -43,6 +44,12 @@ commands =
 [testenv:py35]
 commands = nosetests xtesting/tests/unit
 
+[testenv:bashate]
+basepython = python2.7
+files =
+  build.sh
+commands = bashate {[testenv:bashate]files}
+
 [testenv:cover]
 basepython = python2.7
 dirs =
@@ -51,8 +58,6 @@ dirs =
   xtesting/tests/unit/energy
   xtesting/tests/unit/utils/test_decorators.py
 commands = nosetests --with-coverage --cover-tests \
-  --cover-package xtesting.ci.tier_builder \
-  --cover-package xtesting.ci.tier_handler \
   --cover-package xtesting.core \
   --cover-package xtesting.energy \
   --cover-package xtesting.tests.unit \
@@ -62,7 +67,7 @@ commands = nosetests --with-coverage --cover-tests \
 [testenv:perm]
 basepython = python2.7
 whitelist_externals = bash
-path=. -not -path './.tox/*' -not -path './.git/*' -not -path './docs/com/pres/reveal.js/*'
+path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/reveal.js/*'
 commands =
   bash -c "\
     find {[testenv:perm]path} \( -type f -not -perm 644 -o -type d -not -perm 755 \) \