tox-based build matrix

Author: ElSaico

Diff for: .gitignore

@@ -12,3 +12,6 @@ tests/htmlcov
 .coverage
 htmlcov
 *.egg-info
+.cache/
+.eggs/
+.tox/

Diff for: .travis.yml

@@ -1,19 +1,16 @@
 language: python
 
 python:
-  - "3.4"
+  - "3.5"
   - "3.3"
   - "2.7"
+  - "pypy"
+  - "pypy3"
 
 # command to install dependencies
 install:
-    - pip install -r test${TRAVIS_PYTHON_VERSION:0:1}_requirements.txt
-    - pip install coveralls
+    - pip install tox-travis
 
 # command to run tests
 script:
-    - py.test --cov=restless
-
-# command to notify coveralls
-after_success:
-    - coveralls
+    - tox

Diff for: test2_requirements.txt

@@ -0,0 +1,29 @@
+[tox]
+envlist = py{27,34,35,py27,py32,py33}-{dj18,dj19,pyramid,tornado},
+          py{27,34,35,py27}-flask
+
+[testenv]
+basepython =
+    py27: python2.7
+    py34: python3.4
+    py35: python3.5
+    pypy27: pypy2.7
+    pypy32: pypy3.2
+    pypy33: pypy3.3
+deps =
+    pytest
+    pytest-cov
+    dj18: Django>=1.8,<1.9
+    dj19: Django>=1.9,<1.10
+    flask: Flask
+    pyramid: Pyramid
+    tornado: tornado
+commands =
+    py.test --cov=restless
+
+[tox:travis]
+2.7 = py27
+3.4 = py34
+3.5 = py35
+pypy = pypy27
+pypy3 = pypy32