diff options
| -rw-r--r-- | tests/test_z_cmdline.py | 11 | ||||
| -rw-r--r-- | tox/_venv.py | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py index 139f232..c9596ec 100644 --- a/tests/test_z_cmdline.py +++ b/tests/test_z_cmdline.py @@ -362,7 +362,16 @@ def test_test_simple(cmd, initproj): def test_develop(initproj, cmd): initproj("example123", filedefs={'tox.ini': """ """}) - result = cmd.run("tox", "-v", "--develop") + result = cmd.run("tox", "-vv", "--develop") + assert not result.ret + assert "sdist-make" not in result.stdout.str() + +def test_usedevelop(initproj, cmd): + initproj("example123", filedefs={'tox.ini': """ + [tox] + usedevelop=True + """}) + result = cmd.run("tox", "-vv") assert not result.ret assert "sdist-make" not in result.stdout.str() diff --git a/tox/_venv.py b/tox/_venv.py index a7845e6..ddd3c42 100644 --- a/tox/_venv.py +++ b/tox/_venv.py @@ -217,14 +217,15 @@ class VirtualEnv(object): def developpkg(self, setupdir, action): assert action is not None if getattr(self, 'just_created', False): - action.setactivity("inst", sdistpath) + action.setactivity("develop-inst", setupdir) self.finish() extraopts = [] else: - action.setactivity("inst-nodeps", sdistpath) + if not self._needs_reinstall(setupdir, action): + action.setactivity("develop-inst-noop", setupdir) + return + action.setactivity("develop-inst-nodeps", setupdir) extraopts = ['--no-deps'] - if not self._needs_reinstall(setupdir, action): - return self._install(['-e', setupdir], extraopts=extraopts, action=action) def installpkg(self, sdistpath, action): |