Merge branch 'merge.py3k' of github.com:LexMachinaInc/supervisor into merge.py3k

.travis.yml

@@ -4,9 +4,9 @@ env:
     - TOXENV=py26
     - TOXENV=py27
     # - TOXENV=pypy
-    # - TOXENV=py32 # no u"" support
+    - TOXENV=py32 # no u"" support
     - TOXENV=py33
-    # - TOXENV=py34 # Not support on Travis-Ci at this time
+    # - TOXENV=py34 # No support on Travis-Ci at this time
 install:
     - travis_retry pip install tox==1.6.1
 script:

tox.ini

@@ -2,13 +2,13 @@
 
 [tox]
 envlist =
-    cover,py26,py27,py33,py34
+    cover,py26,py27,py32,py33,py34
 
 [testenv]
 commands =
     python setup.py test -q
 deps =
-    https://github.com/Supervisor/meld3/tarball/master
+    meld3 >= 1.0.0
     mock >= 0.5.0
 usedevelop = true
 
@@ -22,7 +22,7 @@ basepython =
 commands =
     python setup.py nosetests --with-xunit --with-xcoverage --cover-package=supervisor --cover-erase
 deps =
-    https://github.com/Supervisor/meld3/tarball/master
+    meld3 >= 1.0.0
     mock >= 0.5.0
     nose
     coverage