diff options
| -rwxr-xr-x | CHANGELOG | 3 | ||||
| -rw-r--r-- | tests/test_config.py | 10 | ||||
| -rw-r--r-- | tox/_config.py | 3 |
3 files changed, 14 insertions, 2 deletions
@@ -12,6 +12,9 @@ - rework and simplify "commands" parsing and in particular posargs substitutions to avoid various win32/posix related quoting issues. +- make sure that the --installpkg option trumps any usedevelop settings + in tox.ini or + 1.6.1 ----- diff --git a/tests/test_config.py b/tests/test_config.py index e873c9e..fa5d8e9 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -308,7 +308,8 @@ class TestIniParser: assert argvlist[0] == ["cmd1"] assert argvlist[1] == ["cmd2", "value2", "other"] - def test_positional_arguments_are_only_replaced_when_standing_alone(self, tmpdir, newconfig): + def test_positional_arguments_are_only_replaced_when_standing_alone(self, + tmpdir, newconfig): config = newconfig(""" [section] key= @@ -406,6 +407,13 @@ class TestConfigTestEnv: assert envconfig.envlogdir == envconfig.envdir.join("log") assert envconfig.setenv is None + def test_installpkg_tops_develop(self, newconfig): + config = newconfig(["--installpkg=abc"], """ + [testenv] + usedevelop = True + """) + assert not config.envconfigs["python"].develop + def test_specific_command_overrides(self, tmpdir, newconfig): config = newconfig(""" [testenv] diff --git a/tox/_config.py b/tox/_config.py index 58fa7c0..de668ed 100644 --- a/tox/_config.py +++ b/tox/_config.py @@ -272,7 +272,8 @@ class parseini: vc.config = config reader = IniReader(self._cfg, fallbacksections=["testenv"]) reader.addsubstitutions(**subs) - vc.develop = reader.getbool(section, "usedevelop", config.option.develop) + vc.develop = not config.option.installpkg and \ + reader.getbool(section, "usedevelop", config.option.develop) vc.envdir = reader.getpath(section, "envdir", "{toxworkdir}/%s" % name) vc.args_are_paths = reader.getbool(section, "args_are_paths", True) if reader.getdefault(section, "python", None): |