jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325762 )

Change subject: Use local tox instead of installing a new one
......................................................................


Use local tox instead of installing a new one

The root tox.ini creates sub environment which each came with their own
copy of tox coming from pypi.  Thus the latest version of tox is used
instead of the locally one which is definitely confusing.

Instead of installing the dependency, allow it as an external command.

Bug: T152549
Change-Id: Ic5f6c5ccafc879a4cc1cd617f28e1b370bd6a8ed
---
M tox.ini
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Volans: Looks good to me, approved



diff --git a/tox.ini b/tox.ini
index dae2fb9..da0bcdc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,12 +7,12 @@
 # https://gerrit.wikimedia.org/r/#/c/124325/
 [testenv:clouseau]
 toxworkdir={toxinidir}/clouseau
-deps = tox
+whitelist_externals = tox
 commands = tox -c {toxinidir}/clouseau/tox.ini
 
 [testenv:checkhosts]
 toxworkdir={toxinidir}/checkhosts
-deps = tox
+whitelist_externals = tox
 commands = tox -c {toxinidir}/checkhosts/tox.ini
 
 [testenv:flake8]
@@ -21,7 +21,7 @@
 
 [testenv:salt-misc]
 toxworkdir={toxinidir}/salt-misc
-deps = tox
+whitelist_externals = tox
 commands = tox -c {toxinidir}/salt-misc/tox.ini
 
 [flake8]

-- 
To view, visit https://gerrit.wikimedia.org/r/325762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5f6c5ccafc879a4cc1cd617f28e1b370bd6a8ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to