6 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/0c8a958f574b/
Changeset: 0c8a958f574b
Branch: tox-1.8-maint
User: hpk42
Date: 2014-10-24 12:58:00+00:00
Summary: adapt test from @msabramo about curly braches (fixes related to
issue150)
Affected #: 1 file
diff -r c80aa9dd3a33c406ac22133f37825003adcee668 -r
0c8a958f574b9d25eb16343e318cf88495087bd5 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -716,12 +716,12 @@
conf = newconfig([], inisource).envconfigs['py24']
argv = conf.commands
assert argv[0] == ['echo', '\\{posargs\\}', '=']
- assert argv[1] == ['echo', 'posargs =']
+ assert argv[1] == ['echo', 'posargs = ', ""]
conf = newconfig(['dog', 'cat'], inisource).envconfigs['py24']
argv = conf.commands
assert argv[0] == ['echo', '\\{posargs\\}', '=', 'dog', 'cat']
- assert argv[1] == ['echo', 'posargs =', 'dog', 'cat']
+ assert argv[1] == ['echo', 'posargs = ', 'dog cat']
def test_rewrite_posargs(self, tmpdir, newconfig):
inisource = """
https://bitbucket.org/hpk42/tox/commits/8f476ebf3d18/
Changeset: 8f476ebf3d18
User: hpk42
Date: 2014-10-24 13:00:32+00:00
Summary: port fix of test
Affected #: 1 file
diff -r d4916d4cc83a6abb7706383e9a249242fb4337fc -r
8f476ebf3d18236ff707367a2a604d1fe15b6681 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -735,12 +735,12 @@
conf = newconfig([], inisource).envconfigs['py24']
argv = conf.commands
assert argv[0] == ['echo', '\\{posargs\\}', '=']
- assert argv[1] == ['echo', 'posargs =']
+ assert argv[1] == ['echo', 'posargs = ', ""]
conf = newconfig(['dog', 'cat'], inisource).envconfigs['py24']
argv = conf.commands
assert argv[0] == ['echo', '\\{posargs\\}', '=', 'dog', 'cat']
- assert argv[1] == ['echo', 'posargs =', 'dog', 'cat']
+ assert argv[1] == ['echo', 'posargs = ', 'dog cat']
def test_rewrite_posargs(self, tmpdir, newconfig):
inisource = """
https://bitbucket.org/hpk42/tox/commits/2aa9b587d12a/
Changeset: 2aa9b587d12a
Branch: tox-1.8-maint
User: hpk42
Date: 2014-10-24 18:18:37+00:00
Summary: finalize 1.8.1
Affected #: 4 files
diff -r 0c8a958f574b9d25eb16343e318cf88495087bd5 -r
2aa9b587d12ae4b325cb4d5a9a801a222ffc328c CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.8.1.dev
+1.8.1
-----------
- fix issue190: allow setenv to be empty.
diff -r 0c8a958f574b9d25eb16343e318cf88495087bd5 -r
2aa9b587d12ae4b325cb4d5a9a801a222ffc328c doc/conf.py
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@
#
# The short X.Y version.
release = "1.8"
-version = "1.8.0"
+version = "1.8.1"
# The full version, including alpha/beta/rc tags.
# The language for content autogenerated by Sphinx. Refer to documentation
diff -r 0c8a958f574b9d25eb16343e318cf88495087bd5 -r
2aa9b587d12ae4b325cb4d5a9a801a222ffc328c 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.8.1.dev1',
+ version='1.8.1',
license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff -r 0c8a958f574b9d25eb16343e318cf88495087bd5 -r
2aa9b587d12ae4b325cb4d5a9a801a222ffc328c tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '1.8.1.dev1'
+__version__ = '1.8.1'
class exception:
class Error(Exception):
https://bitbucket.org/hpk42/tox/commits/5841aacb4950/
Changeset: 5841aacb4950
Branch: tox-1.8-maint
User: hpk42
Date: 2014-10-27 15:29:17+00:00
Summary: Added tag 1.8.1 for changeset 2aa9b587d12a
Affected #: 1 file
diff -r 2aa9b587d12ae4b325cb4d5a9a801a222ffc328c -r
5841aacb49506e93ed2631ca1627f016e911b3c9 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@
c7155565c89d1bb3684c881ca774d921188223a0 1.7.1
e319e464470a5885505ab3e1da1a3a7abe5f86e2 1.7.2
b7374e501bde055c5c2b572e6512d22e10f60088 1.8.0
+2aa9b587d12ae4b325cb4d5a9a801a222ffc328c 1.8.1
https://bitbucket.org/hpk42/tox/commits/245cd0390513/
Changeset: 245cd0390513
Branch: tox-1.8-maint
User: hpk42
Date: 2014-10-27 12:06:29+00:00
Summary: fix issue199 -- fill result log structure ahead of creating
virtualenv
Affected #: 5 files
diff -r 5841aacb49506e93ed2631ca1627f016e911b3c9 -r
245cd0390513e1430e4bb5c73c3c96f6310ce5ab CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+1.8.2.dev
+-----------
+
+- fix issue199: fill resultlog structure ahead of virtualenv creation
+
1.8.1
-----------
@@ -11,7 +16,6 @@
- report subprocess exit code when execution fails. Thanks Marius
Gedminas.
-
1.8.0
-----------
diff -r 5841aacb49506e93ed2631ca1627f016e911b3c9 -r
245cd0390513e1430e4bb5c73c3c96f6310ce5ab 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.8.1',
+ version='1.8.2.dev1',
license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff -r 5841aacb49506e93ed2631ca1627f016e911b3c9 -r
245cd0390513e1430e4bb5c73c3c96f6310ce5ab tests/test_result.py
--- a/tests/test_result.py
+++ b/tests/test_result.py
@@ -10,6 +10,18 @@
p.write("whatever")
return p
+def test_pre_set_header(pkg):
+ replog = ResultLog()
+ d = replog.dict
+ assert replog.dict == d
+ assert replog.dict["reportversion"] == "1"
+ assert replog.dict["toxversion"] == tox.__version__
+ assert replog.dict["platform"] == sys.platform
+ assert replog.dict["host"] == py.std.socket.getfqdn()
+ data = replog.dumps_json()
+ replog2 = ResultLog.loads_json(data)
+ assert replog2.dict == replog.dict
+
def test_set_header(pkg):
replog = ResultLog()
d = replog.dict
diff -r 5841aacb49506e93ed2631ca1627f016e911b3c9 -r
245cd0390513e1430e4bb5c73c3c96f6310ce5ab tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '1.8.1'
+__version__ = '1.8.2.dev1'
class exception:
class Error(Exception):
diff -r 5841aacb49506e93ed2631ca1627f016e911b3c9 -r
245cd0390513e1430e4bb5c73c3c96f6310ce5ab tox/result.py
--- a/tox/result.py
+++ b/tox/result.py
@@ -1,9 +1,7 @@
import sys
import py
-try:
- import json
-except ImportError:
- import simplejson as json
+from tox import __version__ as toxver
+import json
class ResultLog:
@@ -11,12 +9,11 @@
if dict is None:
dict = {}
self.dict = dict
-
- def set_header(self, installpkg):
- from tox import __version__ as toxver
self.dict.update({"reportversion": "1", "toxversion": toxver})
self.dict["platform"] = sys.platform
self.dict["host"] = py.std.socket.getfqdn()
+
+ def set_header(self, installpkg):
self.dict["installpkg"] = dict(
md5=installpkg.computehash("md5"),
sha256=installpkg.computehash("sha256"),
https://bitbucket.org/hpk42/tox/commits/9d8f0d5319e7/
Changeset: 9d8f0d5319e7
User: hpk42
Date: 2014-10-27 15:38:22+00:00
Summary: merge tox-1.8 maintenance
Affected #: 9 files
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@
c7155565c89d1bb3684c881ca774d921188223a0 1.7.1
e319e464470a5885505ab3e1da1a3a7abe5f86e2 1.7.2
b7374e501bde055c5c2b572e6512d22e10f60088 1.8.0
+2aa9b587d12ae4b325cb4d5a9a801a222ffc328c 1.8.1
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,12 +6,21 @@
dependencies. Use ``pip_pre = true`` in a testenv or the ``--pre``
command-line option to restore the previous behavior.
+- fix issue199: fill resultlog structure ahead of virtualenv creation
-1.8.1.dev
+
+1.8.1
-----------
- fix issue190: allow setenv to be empty.
+- allow escaping curly braces with "\". Thanks Marc Abramowitz for the PR.
+
+- allow "." names in environment names such that "py27-django1.7" is a
+ valid environment name. Thanks Alex Gaynor and Alex Schepanovski.
+
+- report subprocess exit code when execution fails. Thanks Marius
+ Gedminas.
1.8.0
-----------
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 doc/conf.py
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@
#
# The short X.Y version.
release = "1.8"
-version = "1.8.0"
+version = "1.8.1"
# The full version, including alpha/beta/rc tags.
# The language for content autogenerated by Sphinx. Refer to documentation
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 doc/config.txt
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -259,6 +259,10 @@
Any ``key=value`` setting in an ini-file can make use
of value substitution through the ``{...}`` string-substitution pattern.
+You can escape curly braces with the ``\`` character if you need them, for
example::
+
+ commands = echo "\{posargs\}" = {posargs}
+
Globally available substitutions
++++++++++++++++++++++++++++++++
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 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.8.1.dev1',
+ version='1.8.2.dev1',
license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 tests/test_result.py
--- a/tests/test_result.py
+++ b/tests/test_result.py
@@ -10,6 +10,18 @@
p.write("whatever")
return p
+def test_pre_set_header(pkg):
+ replog = ResultLog()
+ d = replog.dict
+ assert replog.dict == d
+ assert replog.dict["reportversion"] == "1"
+ assert replog.dict["toxversion"] == tox.__version__
+ assert replog.dict["platform"] == sys.platform
+ assert replog.dict["host"] == py.std.socket.getfqdn()
+ data = replog.dumps_json()
+ replog2 = ResultLog.loads_json(data)
+ assert replog2.dict == replog.dict
+
def test_set_header(pkg):
replog = ResultLog()
d = replog.dict
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '1.8.1.dev1'
+__version__ = '1.8.2.dev1'
class exception:
class Error(Exception):
diff -r 8f476ebf3d18236ff707367a2a604d1fe15b6681 -r
9d8f0d5319e77951c0542ece53c960dc3b2886e7 tox/result.py
--- a/tox/result.py
+++ b/tox/result.py
@@ -1,9 +1,7 @@
import sys
import py
-try:
- import json
-except ImportError:
- import simplejson as json
+from tox import __version__ as toxver
+import json
class ResultLog:
@@ -11,12 +9,11 @@
if dict is None:
dict = {}
self.dict = dict
-
- def set_header(self, installpkg):
- from tox import __version__ as toxver
self.dict.update({"reportversion": "1", "toxversion": toxver})
self.dict["platform"] = sys.platform
self.dict["host"] = py.std.socket.getfqdn()
+
+ def set_header(self, installpkg):
self.dict["installpkg"] = dict(
md5=installpkg.computehash("md5"),
sha256=installpkg.computehash("sha256"),
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
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
