From 6901640f92eac52a6ae72013c63ef6df4e2743f8 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 31 Aug 2017 18:19:40 -0300
Subject: [PATCH] Test with pytest from master/features

Fix #76
---
 .travis.yml  | 54 +++++++++++++++++++++++++++++++---------------------
 appveyor.yml | 16 +++++++++++++++-
 tox.ini      | 16 ++++++++++++----
 3 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 731343e2..79cafe57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,48 @@
 sudo: false
 language: python
-python:
-    - '2.6'
-    - '2.7'
-    - '3.3'
-    - '3.4'
-    - '3.5'
-    - '3.6'
-    - pypy
-    - nightly
-
-# command to install dependencies
-install: "pip install -U tox"
-
-# command to run tests
-env:
-  matrix:
-    - TOXENV=py-pytest28
-    - TOXENV=py-pytest29
-    - TOXENV=py-pytest30
 
 matrix:
   include:
+    - python: '2.6'
+      env: TOXENV=py26
     - python: '2.7'
-      env: TOXENV=check
+      env: TOXENV=py27
+    - python: '3.3'
+      env: TOXENV=py33
+    - python: '3.4'
+      env: TOXENV=py34
+    - python: '3.5'
+      env: TOXENV=py35
     - python: '3.6'
-      env: TOXENV=check
+      env: TOXENV=py36
+    - python: 'pypy'
+      env: TOXENV=pypy
+    - python: 'nightly'
+      env: TOXENV=py37
     - python: '2.7'
       env: TOXENV=benchmark
     - python: '3.6'
       env: TOXENV=benchmark
+    - python: '2.7'
+      env: TOXENV=check
+    - python: '3.6'
+      env: TOXENV=check
+    - python: '3.6'
+      env: TOXENV=docs
+    - python: '2.7'
+      env: TOXENV=pytest-master
+    - python: '3.6'
+      env: TOXENV=pytest-master
+    - python: '2.7'
+      env: TOXENV=pytest-features
+    - python: '3.6'
+      env: TOXENV=pytest-features
+
+install:
+  - pip install -U tox
 
 script:
- - tox --recreate -e $TOXENV
+  - tox
 
 notifications:
   irc:
diff --git a/appveyor.yml b/appveyor.yml
index d6026ebe..d7026b3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,18 @@
+environment:
+  matrix:
+  # note: please use "tox --listenvs" to populate the build matrix below
+  - TOXENV: "check"
+  - TOXENV: "py26"
+  - TOXENV: "py27"
+  - TOXENV: "py34"
+  - TOXENV: "py35"
+  - TOXENV: "py36"
+  - TOXENV: "pypy"
+  # non-default tox environments
+  - TOXENV: "check"
+  - TOXENV: "docs"
+  - TOXENV: "pytest-master"
+  - TOXENV: "pytest-features"
 
 install:
   - echo Installed Pythons
@@ -18,4 +33,3 @@ build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
   - C:\Python35\python -m tox
-  
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 29921dfe..0396139c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,20 @@
 [tox]
-envlist=check,py{26,27,34,35,36,py}-pytest{28,29,30}
+envlist=check,py{26,27,34,35,36,py}
 
 [testenv]
 commands=py.test {posargs:testing/}
 deps=
-  pytest28: pytest~=2.8.0
-  pytest29: pytest~=2.9.0
-  pytest30: pytest~=3.0.0
+  pytest
+
+[testenv:pytest-master]
+commands=py.test {posargs:testing/}
+deps=
+  git+https://github.com/pytest-dev/pytest.git@master
+
+[testenv:pytest-features]
+commands=py.test {posargs:testing/}
+deps=
+  git+https://github.com/pytest-dev/pytest.git@features
 
 [testenv:benchmark]
 commands=py.test {posargs:testing/benchmark.py}