From 1cf809fa29602e4693da8878044a923e1e3b465e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 3 Feb 2013 15:00:32 +0100
Subject: backout --extradeps addition; finally found a way to not need it (and
 there are no requests for it)

---
 CHANGELOG            | 10 ++++------
 setup.py             |  2 +-
 tests/test_config.py | 16 ----------------
 tox/__init__.py      |  2 +-
 tox/_config.py       |  6 +-----
 tox/_pytestplugin.py |  1 -
 toxbootstrap.py      |  2 +-
 7 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 525c1a4..d73a57b 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,10 @@
 1.4.3.dev
 -----------------
 
-- add --extradeps option to install extra dependencies in all testenvs
-
-- experimentally introduce --installpkg=PATH option to install a package
-  rather than create/install an sdist package.  This will still require
-  and use tox.ini and tests from the current working dir (and not from the
-  remote package).
+- experimentally introduce --installpkg=PATH option to install a package rather than
+  create/install an sdist package.  This will still require and use
+  tox.ini and tests from the current working dir (and not from the remote
+  package).
 
 - substitute {envsitepackagesdir} with the package installation directory (closes #72)
   (thanks g2p)
diff --git a/setup.py b/setup.py
index bca2edf..49c2b54 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://tox.testrun.org/',
-        version='1.4.3.dev6',
+        version='1.4.3.dev5',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tests/test_config.py b/tests/test_config.py
index 15532be..9afa45b 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -332,22 +332,6 @@ class TestConfigTestEnv:
         assert envconfig.envlogdir == envconfig.envdir.join("log")
         assert envconfig.setenv is None
 
-    def test_extradeps(self, tmpdir, newconfig):
-        config = newconfig(["--extradeps=dep1,dep2"], """
-            [testenv]
-            deps = abc
-
-            [testenv:hello1]
-            [testenv:hello2]
-            deps = cde
-        """)
-        assert config.envconfigs["hello1"].deps[0].name == "abc"
-        assert config.envconfigs["hello1"].deps[1].name == "dep1"
-        assert config.envconfigs["hello1"].deps[2].name == "dep2"
-        assert config.envconfigs["hello2"].deps[0].name == "cde"
-        assert config.envconfigs["hello2"].deps[1].name == "dep1"
-        assert config.envconfigs["hello2"].deps[2].name == "dep2"
-
     def test_specific_command_overrides(self, tmpdir, newconfig):
         config = newconfig("""
             [testenv]
diff --git a/tox/__init__.py b/tox/__init__.py
index 7c24641..b57d4d6 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '1.4.3.dev6'
+__version__ = '1.4.3.dev5'
 
 class exception:
     class Error(Exception):
diff --git a/tox/_config.py b/tox/_config.py
index d24d044..171e20b 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -96,8 +96,6 @@ def prepare_parse(pkgname):
     parser.add_argument("-r", "--recreate", action="store_true",
         dest="recreate",
         help="force recreation of virtual environments")
-    parser.add_argument("--extradeps", action="store", default="",
-        help="comma-separated list of global extra dependencies")
     parser.add_argument("args", nargs="*",
         help="additional arguments available to command positional substition")
     return parser
@@ -289,9 +287,7 @@ class parseini:
 
         vc.commands = reader.getargvlist(section, "commands")
         vc.deps = []
-        deplines = reader.getlist(section, "deps")
-        deplines.extend(filter(None, config.option.extradeps.split(",")))
-        for depline in deplines:
+        for depline in reader.getlist(section, "deps"):
             m = re.match(r":(\w+):\s*(\S+)", depline)
             if m:
                 iname, name = m.groups()
diff --git a/tox/_pytestplugin.py b/tox/_pytestplugin.py
index 01c9033..70fa48a 100644
--- a/tox/_pytestplugin.py
+++ b/tox/_pytestplugin.py
@@ -26,7 +26,6 @@ def pytest_funcarg__newconfig(request, tmpdir):
         s = py.std.textwrap.dedent(source)
         p = tmpdir.join("tox.ini")
         p.write(s)
-        assert isinstance(args, list)
         old = tmpdir.chdir()
         try:
             return parseconfig(args)
diff --git a/toxbootstrap.py b/toxbootstrap.py
index 614817a..c3fea7d 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -58,7 +58,7 @@ ToDo
 
 """
 
-__version__ = '1.4.3.dev6'
+__version__ = '1.4.3.dev5'
 
 import sys
 import os
-- 
cgit v1.2.1