From 5634a6a4187cc20c8fda1c9fe253cd2b9aea4350 2016-07-29 07:11:25
From: Danilo J. S. Bellini <danilo.bellini@gmail.com>
Date: 2016-07-29 07:11:25
Subject: [PATCH] Rewrite tox.ini, including PyPy and CPython 3.5+

---

diff --git a/tox.ini b/tox.ini
index 3a19738..465b75d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,44 +1,28 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# 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 `invoke` and `lessc` to be on your PATH.
-# "pip install invoke" will install invoke. 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 (http://tox.testrun.org/) is a virtualenv manager for running tests in
+; multiple environments. This configuration file gets the requirements from
+; setup.py like a "pip install ipython[test]". To create the environments, it
+; requires every interpreter available/installed.
+;  -- Commands --
+; pip install tox  # Installs tox
+; tox              # Runs the tests (call from the directory with tox.ini)
+; tox -r           # Runs rebuilding virtual environments
+; tox -e py35,pypy # Runs only in the selected environments
+; tox -- --all -j  # Runs "iptest --all -j" in every environment
 
 [tox]
-envlist = py27, py33, py34
+envlist = py{36,35,34,33,27,py}
+skip_missing_interpreters = True
+toxworkdir = /tmp/tox_ipython
 
 [testenv]
+; PyPy requires its Numpy fork instead of "pip install numpy"
+; Other IPython/testing dependencies should be in setup.py, not here
 deps =
-  pyzmq
-  nose
-  tornado<4.0
-  jinja2
-  sphinx
-  pygments
-  jsonpointer
-  jsonschema
-  mistune
+  pypy: https://bitbucket.org/pypy/numpy/get/master.zip
+  py{36,35,34,33,27}: matplotlib
+  .[test]
 
-# To avoid loading IPython module in the current directory, change
-# current directory to ".tox/py*/tmp" before running test.
+; It's just to avoid loading IPython module in the current directory
 changedir = {envtmpdir}
 
-commands =
-  iptest --all
-
-[testenv:py27]
-deps=
-  mock
-  {[testenv]deps}
+commands = iptest {posargs}