Merge "Update tox.ini files from release-tools gold copy"

This commit is contained in:
Jenkins 2016-09-09 23:24:30 +00:00 committed by Gerrit Code Review
commit ab0402495c
2 changed files with 11 additions and 3 deletions

3
lib/.keep Normal file
View File

@ -0,0 +1,3 @@
This file was created by release-tools to ensure that this empty
directory is preserved in vcs re: lint check definitions in global
tox.ini files. This file can be removed if/when this dir is actually in use.

11
tox.ini
View File

@ -1,3 +1,6 @@
# Classic charm: ./tox.ini
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos.
[tox]
envlist = pep8,py27
skipsdist = True
@ -5,11 +8,13 @@ skipsdist = True
[testenv]
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
CHARM_DIR={envdir}
AMULET_SETUP_TIMEOUT=2700
passenv = HOME TERM AMULET_HTTP_PROXY AMULET_OS_VIP
install_command =
pip install --allow-unverified python-apt {opts} {packages}
commands = ostestr {posargs}
whitelist_externals = juju
passenv = HOME TERM AMULET_*
[testenv:py27]
basepython = python2.7
@ -20,7 +25,7 @@ deps = -r{toxinidir}/requirements.txt
basepython = python2.7
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = flake8 {posargs} --exclude */charmhelpers hooks unit_tests tests actions
commands = flake8 {posargs} hooks unit_tests tests actions lib
charm-proof
[testenv:venv]
@ -72,4 +77,4 @@ commands =
[flake8]
ignore = E402,E226
exclude = hooks/charmhelpers
exclude = */charmhelpers