diff options
author | holger krekel <holger@merlinux.eu> | 2015-03-23 21:46:42 +0100 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2015-03-23 21:46:42 +0100 |
commit | fc52f568c68142477d492f73ce3a8287feee29cc (patch) | |
tree | 5d3cadcad73f1a4783a09dcb8070088499572d92 | |
parent | cc90343101ac3ccc3fa2ee3e1df6005adab1406e (diff) | |
download | tox-1.9.2.tar.gz |
- backout ability that --force-deps substitutes name/versions in1.9.2
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
-rw-r--r-- | CHANGELOG | 7 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | tests/test_config.py | 44 | ||||
-rw-r--r-- | tox/__init__.py | 2 | ||||
-rw-r--r-- | tox/_config.py | 30 |
5 files changed, 11 insertions, 74 deletions
@@ -1,6 +1,11 @@ -DEV +1.9.2 ----------- +- 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. + 1.9.1 ----------- @@ -26,7 +26,7 @@ def main(): description='virtualenv-based automation of test activities', long_description=open("README.rst").read(), url='http://tox.testrun.org/', - version='1.9.2.dev1', + version='1.9.2', license='http://opensource.org/licenses/MIT', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', diff --git a/tests/test_config.py b/tests/test_config.py index c030db8..f957771 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1423,50 +1423,6 @@ class TestCmdInvocation: r'*deps=*dep1, dep2==5.0*', ]) - def test_force_dep_with_requirements_txt_file(self, cmd, initproj): - """ - Make sure we can override dependencies configured in external reqs.txt - when using the command line option --force-dep. - """ - initproj("example123-0.5", filedefs={ - 'tox.ini': ''' - [tox] - - [testenv] - deps= - dep1==1.0 - -r{toxinidir}/reqs.txt - ''', - 'reqs.txt': ''' - -e git://hello/world/git#egg=Hello - # comment - dep2>=2.0 # comment - - - -i http://index.local/ - dep3 - dep4==4.0 - -r reqs2.txt - ''', - 'reqs2.txt': ''' - dep5>=2.2 - ''' - }) - config = parseconfig( - ['--force-dep=dep1==1.5', '--force-dep=dep2==2.1', - '--force-dep=dep3==3.0']) - assert config.option.force_dep == [ - 'dep1==1.5', 'dep2==2.1', 'dep3==3.0'] - - deps = config.envconfigs['python'].deps - assert len(deps) == 6 - expected = ['dep1==1.5', 'Hello', 'dep2==2.1', - 'dep3==3.0', 'dep4', 'dep5'] - - for index, dep in enumerate(deps): - assert dep.name == expected[index] - - class TestArgumentParser: def test_dash_e_single_1(self): 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) |