Merged hpk42/tox into default; Resolved conflict in CHANGELOG

5 files changed, 17 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1b19722..8ccd135 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,9 @@
 
 - echo output to stdout when ``--report-json`` is used
 
+- fix issue11: add a ``skip_install`` per-testenv setting which
+  prevents the installation of a package. Thanks Julian Krause.
+
 - fix issue124: ignore command exit codes; when a command has a "-" prefix,
   tox will ignore the exit code of that command
 
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1f1a6ad..b3e523e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -24,6 +24,7 @@ Matt Good
 Mattieu Agopian
 Asmund Grammeltwedt
 Ionel Maries Cristian
+Julian Krause
 Alexandre Conrad
 Morgan Fainberg
 Marc Schlaich
diff --git a/doc/config.txt b/doc/config.txt
index b2d9024..d743e1b 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -254,6 +254,16 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
     **default**: ``False``
 
+.. confval:: skip_install=BOOL
+
+    .. versionadded:: 1.9
+
+    Do not install the current package. This can be used when you need the
+    virtualenv management but do not want to install the current package
+    into that environment.
+    
+    **default**: ``False``
+
 
 Substitutions
 -------------
diff --git a/tox/_cmdline.py b/tox/_cmdline.py
index d7010da..9362d86 100644
--- a/tox/_cmdline.py
+++ b/tox/_cmdline.py
@@ -474,7 +474,7 @@ class Session:
             if self.setupenv(venv):
                 if venv.envconfig.develop:
                     self.developpkg(venv, self.config.setupdir)
-                elif self.config.skipsdist:
+                elif self.config.skipsdist or venv.envconfig.skip_install:
                     self.finishvenv(venv)
                 else:
                     self.installpkg(venv, sdist_path)
diff --git a/tox/_config.py b/tox/_config.py
index 41f02ec..5f89ec4 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -395,6 +395,8 @@ class parseini:
         vc.pip_pre = config.option.pre or reader.getbool(
             section, "pip_pre", False)
 
+        vc.skip_install = reader.getbool(section, "skip_install", False)
+
         return vc
 
     def _getenvdata(self, reader, toxsection):