2 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/452288d6c500/
Changeset: 452288d6c500
User: hpk42
Date: 2015-03-23 20:46:42+00:00
Summary: - 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
Affected #: 5 files
diff -r 7afd77a31d4fc4c150fd039aaf521d26eb1becc2 -r
452288d6c50042ccfc1c944b24f4eb47df8f6823 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
-----------
diff -r 7afd77a31d4fc4c150fd039aaf521d26eb1becc2 -r
452288d6c50042ccfc1c944b24f4eb47df8f6823 setup.py
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
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 -r 7afd77a31d4fc4c150fd039aaf521d26eb1becc2 -r
452288d6c50042ccfc1c944b24f4eb47df8f6823 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1423,50 +1423,6 @@
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 -r 7afd77a31d4fc4c150fd039aaf521d26eb1becc2 -r
452288d6c50042ccfc1c944b24f4eb47df8f6823 tox/__init__.py
--- 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 -r 7afd77a31d4fc4c150fd039aaf521d26eb1becc2 -r
452288d6c50042ccfc1c944b24f4eb47df8f6823 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -9,8 +9,7 @@
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 @@
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 @@
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)
https://bitbucket.org/hpk42/tox/commits/0ef1427db319/
Changeset: 0ef1427db319
User: hpk42
Date: 2015-03-23 20:59:48+00:00
Summary: Added tag 1.9.2 for changeset 452288d6c500
Affected #: 1 file
diff -r 452288d6c50042ccfc1c944b24f4eb47df8f6823 -r
0ef1427db3193109a817d08806e4d7b80d9d9319 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -22,3 +22,4 @@
2aa9b587d12ae4b325cb4d5a9a801a222ffc328c 1.8.1
ad64513cf6bf0ef99a4a11678aa3260d8078976f 1.9.0
7ccc0b0bd25e1e01dfd861b890ada69042a32c3a 1.9.1
+452288d6c50042ccfc1c944b24f4eb47df8f6823 1.9.2
Repository URL: https://bitbucket.org/hpk42/tox/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit
