Merge pull request #2163 from nicoddemus/merge-master-into-features

Merge master into features
pytest-dev · Dec 29, 2016 · 964ccb9 · 964ccb9
2 parents 669332b + 402fbe5
commit 964ccb9
Show file tree

Hide file tree

Showing 48 changed files with 626 additions and 317 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,8 +30,12 @@ env:
 
 matrix:
   allow_failures:
-    # py35-trial failing on Linux: #1989
+    # see #1989
+    - env: TESTENV=py27-trial
     - env: TESTENV=py35-trial
+  include:
+    - env: TESTENV=py36
+      python: '3.6-dev'
 
 script: tox --recreate -e $TESTENV
 

diff --git a/AUTHORS b/AUTHORS
@@ -82,6 +82,7 @@ Katarzyna Jachim
 Kevin Cox
 Lee Kamentsky
 Lev Maximov
+Loic Esteve
 Lukas Bednar
 Luke Murphy
 Maciek Fijalkowski