summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Ring <dfring@gmail.com>2015-12-17 15:44:22 -0500
committerDan Ring <dfring@gmail.com>2015-12-17 15:44:22 -0500
commitc1e99112eede07f6f95d482f9eef388ea1ba459b (patch)
tree0b55b67b6c3ac69099190d1acd47c4ee64f1543b
parentdeaacda2f7691916ff9fb703536b012d6d546208 (diff)
downloadtox-c1e99112eede07f6f95d482f9eef388ea1ba459b.tar.gz
Add --workdir to override the 'toxworkdir' config option
-rw-r--r--tox/config.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tox/config.py b/tox/config.py
index 079dff3..e071805 100644
--- a/tox/config.py
+++ b/tox/config.py
@@ -366,6 +366,9 @@ def tox_addoption(parser):
help="override sitepackages setting to True in all envs")
parser.add_argument("--skip-missing-interpreters", action="store_true",
help="don't fail tests for missing interpreters")
+ parser.add_argument("--workdir", action="store",
+ dest="workdir", metavar="PATH", default=None,
+ help="tox working directory")
parser.add_argument("args", nargs="*",
help="additional arguments available to command positional substitution")
@@ -664,7 +667,10 @@ class parseini:
reader.addsubstitutions(toxinidir=config.toxinidir,
homedir=config.homedir)
- config.toxworkdir = reader.getpath("toxworkdir", "{toxinidir}/.tox")
+ if config.option.workdir is None:
+ config.toxworkdir = reader.getpath("toxworkdir", "{toxinidir}/.tox")
+ else:
+ config.toxworkdir = config.toxinidir.join(config.option.workdir, abs=True)
config.minversion = reader.getstring("minversion", None)
if not config.option.skip_missing_interpreters: