diff options
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -1,11 +1,8 @@ [tox] minversion = 3.2 skipsdist = True -envlist = linters,py3{-docker} +envlist = linters,py3 ignore_basepython_conflict = True -# TODO(stephenfin): It would be good to set 'requires = tox-docker', but doing -# so borks the tools/pip.sh wrapper we're using here and probably isn't what -# we want in the gate :( [testenv] basepython = python3 @@ -19,7 +16,6 @@ setenv = SQLALCHEMY_WARN_20={env:SQLALCHEMY_WARN_20:1} PYTHONWARNINGS=always::DeprecationWarning:zuul.driver.sql.sqlconnection,always::DeprecationWarning:tests.base,always::DeprecationWarning:tests.unit.test_database,always::DeprecationWarning:zuul.driver.sql.alembic.env,always::DeprecationWarning:zuul.driver.sql.alembic.script passenv = - DOCKER_* NODEPOOL_ZK_HOST OS_LOG_CAPTURE OS_LOG_DEFAULTS @@ -40,8 +36,6 @@ whitelist_externals = bash deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -docker = - docker: zookeeper:3.4 commands = bash -c 'stestr run --slowest --concurrency=`python -c "import multiprocessing; print(max(int(multiprocessing.cpu_count()-1),1))"` {posargs}' @@ -96,7 +90,6 @@ deps = [testenv:remote] passenv = - DOCKER_* NODEPOOL_ZK_HOST OS_LOG_CAPTURE OS_LOG_DEFAULTS |