From fc52f568c68142477d492f73ce3a8287feee29cc Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 23 Mar 2015 21:46:42 +0100
Subject: - backout ability that --force-deps substitutes name/versions in  
 requirement files due to various issues.

- This fixes issue228, fixes issue230, fixes issue231
  which popped up with 1.9.1.

- bump to 1.9.2 version
---
 tox/__init__.py |  2 +-
 tox/_config.py  | 30 +++---------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

(limited to 'tox')

diff --git a/tox/__init__.py b/tox/__init__.py
index c2ac3ab..2cc85ab 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '1.9.2.dev1'
+__version__ = '1.9.2'
 
 class exception:
     class Error(Exception):
diff --git a/tox/_config.py b/tox/_config.py
index b7afc62..3d26686 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -9,8 +9,7 @@ import pkg_resources
 import itertools
 
 from tox.interpreters import Interpreters
-from pip.req.req_file import parse_requirements
-from pip.download import PipSession
+
 import py
 
 import tox
@@ -372,8 +371,6 @@ class parseini:
         vc.whitelist_externals = reader.getlist(section,
                                                 "whitelist_externals")
         vc.deps = []
-        requirement_files = []
-
         for depline in reader.getlist(section, "deps"):
             m = re.match(r":(\w+):\s*(\S+)", depline)
             if m:
@@ -382,29 +379,8 @@ class parseini:
             else:
                 name = depline.strip()
                 ixserver = None
-
-
-            # We want to parse requirements.txt files last so that
-            # we can process them with forced dependencies
-            if name[:2] == '-r':
-                fname = name[2:].strip()
-                requirement_files.append(fname)
-            else:
-                name = self._replace_forced_dep(name, config)
-                vc.deps.append(DepConfig(name, ixserver))
-
-            pip_session = PipSession()
-
-        for requirement_file in requirement_files:
-            req_deps = parse_requirements(
-                requirement_file,
-                session=pip_session
-            )
-
-            for r in req_deps:
-                name = self._replace_forced_dep(r.name, config)
-                vc.deps.append(DepConfig(name, ixserver))
-
+            name = self._replace_forced_dep(name, config)
+            vc.deps.append(DepConfig(name, ixserver))
         vc.distribute = reader.getbool(section, "distribute", False)
         vc.sitepackages = self.config.option.sitepackages or \
                           reader.getbool(section, "sitepackages", False)
-- 
cgit v1.2.1