summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-13 22:45:57 +0000
committerGerrit Code Review <review@openstack.org>2019-06-13 22:45:58 +0000
commit518199231cacf05fbfd76d79480082357919dec3 (patch)
tree0349124c1d8401b218ff15aa6a34f50ad6261684 /tox.ini
parent5bf6bfad604a0e245941e5030b784dbb639b2343 (diff)
parentcc615d0957cf81ff05bbe377152edde538f6ac70 (diff)
downloadnova-518199231cacf05fbfd76d79480082357919dec3.tar.gz
Merge "update comment on ignore_basepython_conflict"
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index f0574ef94b..ed9a1544f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
[tox]
minversion = 3.1.1
envlist = py{27,36,37},functional,pep8
-# Automatic envs (pyXX) will use the python version appropriate to that
-# env and ignore basepython inherited from [testenv]. That's what we
-# want, and we don't need to be warned about it.
+# Automatic envs (pyXX) will only use the python version appropriate to that
+# env and ignore basepython inherited from [testenv] if we set
+# ignore_basepython_conflict.
ignore_basepython_conflict = True
[testenv]