Merge branch 'pytest-2.7'

2015-07-19 15:25:04 +02:00
parent 604a39f5ef 412b43b216
commit 6af7172204
16 changed files with 289 additions and 65 deletions
@@ -7,24 +7,26 @@ install: "pip install -U tox"
 # # command to run tests
 env:
  matrix:
+    - TESTENV=coveralls
+    - TESTENV=doctesting
    - TESTENV=flakes
    - TESTENV=py26
    - TESTENV=py27
+    - TESTENV=py27-cxfreeze
+    - TESTENV=py27-nobyte
+    - TESTENV=py27-pexpect
+    - TESTENV=py27-subprocess
+    - TESTENV=py27-trial
+    - TESTENV=py27-xdist
+    - TESTENV=py33
    - TESTENV=py33
    - TESTENV=py34
+    - TESTENV=py34-pexpect
+    - TESTENV=py34-trial
+    - TESTENV=py34-trial
+    - TESTENV=py34-xdist
    - TESTENV=py35
    - TESTENV=pypy
-    - TESTENV=py27-pexpect
-    - TESTENV=py34-pexpect
-    - TESTENV=py27-nobyte
-    - TESTENV=py27-xdist
-    - TESTENV=py34-xdist
-    - TESTENV=py27-trial
-    - TESTENV=py34-trial
-    - TESTENV=py27-subprocess
-    - TESTENV=doctesting
-    - TESTENV=py27-cxfreeze
-    - TESTENV=coveralls
 matrix:
  allow_failures:
    # py35 is currently broken on travis, see #744