From 9aa1df89ee4ebd971c77ff47fb73c181adf518a8 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 7 Jul 2010 14:52:40 +0200
Subject: [PATCH] bump to xdist 1.4

---
 CHANGELOG         | 5 ++++-
 setup.py          | 2 +-
 tox.ini           | 5 ++---
 xdist/__init__.py | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 56d576e..4cef62e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,13 @@
-1.4a1
+1.4
 -------------------------
 
 - perform distributed testing related reporting in the plugin 
   rather than having dist-related code in the generic py.test 
   distribution
 
+- depend on execnet-1.0.7 which adds "env1:NAME=value" keys to 
+  gateway specification strings. 
+
 1.3
 -------------------------
 
diff --git a/setup.py b/setup.py
index 9c28eb8..caba1df 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
     packages = ['xdist'],
     entry_points = {'pytest11': ['xdist = xdist.plugin'],},
     zip_safe=False,
-    install_requires = ['execnet>=1.0.6', 'py>1.3.1'],
+    install_requires = ['execnet>=1.0.7', 'py>1.3.1'],
     classifiers=[
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/tox.ini b/tox.ini
index ccb49f8..f3be663 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,18 +9,17 @@ sdistsrc={distshare}/pytest-xdist-**LATEST**
 changedir=testing
 deps= 
     {distshare}/py-**LATEST**
+    {distshare}/execnet-**LATEST**
 commands=
     py.test -rsfxX --tools-on-path \
             --junitxml={envlogdir}/junit-{envname}.xml []
 [testenv:py27]
 basepython=python2.7
-deps=
-    {distshare}/py-**LATEST**
-    {distshare}/execnet-**LATEST**
 [testenv:py26]
 basepython=python2.6
 deps=
     {distshare}/py-**LATEST**
+    {distshare}/execnet-**LATEST**
     pexpect
 #[testenv:py26-py132]
 #basepython=python2.6
diff --git a/xdist/__init__.py b/xdist/__init__.py
index 3ff7323..47cd1cb 100644
--- a/xdist/__init__.py
+++ b/xdist/__init__.py
@@ -1,3 +1,3 @@
 #
-__version__ = "1.4a1"
+__version__ = "1.4"