Merge pull request #6319 from cel4/update_tox_ini

Updated tox.ini for local testing.

tox.ini

@@ -3,23 +3,44
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
+# Building the source distribution requires both fabric's fab binary
+# (http://www.fabfile.org/) and the lessc binary of the css preprocessor
+# less (http://lesscss.org/) in the PATH.
+# "pip install fabric" will install fabric. Less can be installed by
+# node.js' (http://nodejs.org/) package manager npm:
+# "npm install -g less".
+
+# Javascript tests need additional dependencies that can be installed
+# using node.js' package manager npm:
+# [*] casperjs:  "npm install -g casperjs"
+# [*] slimerjs:  "npm install -g slimerjs"
+# [*] phantomjs: "npm install -g phantomjs"
+
+# Note: qt4 versions break some tests with tornado versions >=4.0.
+
 [tox]
-envlist = py27, py33
+envlist = py27, py33, py34
 
 [testenv]
-deps = 
+deps =
+  pyzmq
   nose
-  mock
-  tornado
+  tornado<4.0
   jinja2
   sphinx
   pygments
+  jsonpointer
+  jsonschema
+  mistune
+
 # To avoid loading IPython module in the current directory, change
 # current directory to ".tox/py*/tmp" before running test.
 changedir = {envtmpdir}
 
 commands =
-    # As pip does not treat egg, use easy_install to install PyZMQ.
-    # See also: https://github.com/zeromq/pyzmq
-    easy_install -q pyzmq
-    iptest --all
+  iptest --all
+
+[testenv:py27]
+deps=
+  mock
+  {[testenv]deps}