Dependancy matrix improved.

Author: amateja

requirements/test.txt

@@ -2,4 +2,3 @@ mock
 pylint
 pytest-cov
 pytest-pep8
-pytest-xdist

tox.ini

@@ -1,7 +1,8 @@
 [tox]
 envlist =
-    py{36,35,34,33,27,26}-pytest{30,29,28,27,26}
-    pypy-pytest{30,29,28,27,26}
+    py{36,35}-pytest{31,30,29,28,27}
+    py{34,33,27,26}-pytest{31,30,29,28,27,26}
+    pypy-pytest{31,30,29,28,27,26}
 
 
 [pytest]
@@ -16,10 +17,14 @@ usedevelop = True
 deps =
     -rrequirements/main.txt
     -rrequirements/test.txt
-    pytest23: pytest>=2.3,<2.4
-    pytest24: pytest>=2.4,<2.5
-    pytest25: pytest>=2.5,<2.6
     pytest26: pytest>=2.6,<2.7
+    pytest27: pytest>=2.7,<2.8
+    pytest28: pytest>=2.8,<2.9
+    pytest29: pytest>=2.9,<3.0
+    pytest30: pytest>=3.0,<3.1
+    pytest31: pytest>=3.1,<3.2
+    pytest26: pytest-xdist<1.16.0
+    pytest{31,30,29,28,27}: pytest-xdist
 
 passenv = HOME LANG LC_ALL
 
@@ -46,9 +51,9 @@ whitelist_externals =
 
 
 [tox:travis]
-2.6 = py26-pytest{30,29,28,27,26}
-2.7 = py27-pytest{30,29,28,27,26}
-3.3 = py33-pytest{30,29,28,27,26}
-3.4 = py34-pytest{30,29,28,27,26}
-3.5 = py35-pytest{30,29,28,27,26}
-3.6 = py36-pytest{30,29,28,27,26}
+2.6 = py26-pytest{31,30,29,28,27,26}
+2.7 = py27-pytest{31,30,29,28,27,26}
+3.3 = py33-pytest{31,30,29,28,27,26}
+3.4 = py34-pytest{31,30,29,28,27,26}
+3.5 = py35-pytest{31,30,29,28,27}
+3.6 = py36-pytest{31,30,29,28,27}