merge tox-1.8 maintenance

7 files changed, 33 insertions, 11 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 711f93e..9dc44da 100644
--- 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 --git a/doc/conf.py b/doc/conf.py
index 92ed895..3096b10 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2013, holger krekel and others'
 #
 # 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 --git a/doc/config.txt b/doc/config.txt
index 2fba5f7..6ffd02b 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -259,6 +259,10 @@ Substitutions
 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 --git a/setup.py b/setup.py
index 7bd4d40..46730a0 100644
--- a/setup.py
+++ b/setup.py
@@ -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.8.1.dev1',
+        version='1.8.2.dev1',
         license='http://opensource.org/licenses/MIT',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tests/test_result.py b/tests/test_result.py
index 6df834a..206a99c 100644
--- a/tests/test_result.py
+++ b/tests/test_result.py
@@ -10,6 +10,18 @@ def pkg(tmpdir):
     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 --git a/tox/__init__.py b/tox/__init__.py
index 47b85e4..6797068 100644
--- 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 --git a/tox/result.py b/tox/result.py
index 694138c..9954044 100644
--- 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 @@ class ResultLog:
         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"),