From 3bd65768c5d9e88fc9f74ab5c80432c89aa61521 Mon Sep 17 00:00:00 2001
From: Eldar Abusalimov <eldar.abusalimov@gmail.com>
Date: Wed, 7 Oct 2015 14:02:29 +0300
Subject: [PATCH] tox,travis: Add py35, use >= for deps, infer TOXENV from
 TRAVIS_ENV

---
 .travis.yml | 22 ++++++++++++----------
 tox.ini     |  5 ++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d65142..659e09e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,16 @@
+sudo: false
 language: python
-python: 2.7
-env:
-  - TOX_ENV=pypy3
-  - TOX_ENV=pypy
-  - TOX_ENV=py34
-  - TOX_ENV=py33
-  - TOX_ENV=py32
-  - TOX_ENV=py27
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "pypy"
+  - "pypy3"
+
 install:
   - pip install tox
+  - "export TOXENV=${TRAVIS_ENV/[0-9].[0-9]/py${TRAVIS_ENV/.}}"
 script:
-  - tox -e $TOX_ENV
-sudo: false
+  - tox
diff --git a/tox.ini b/tox.ini
index 3be9fcb..dc91b24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{27,32,33,34,py,py3}
+envlist = py{27,32,33,34,35}, pypy{,3}
 
 [testenv]
 deps =
-    py==1.4.28
-    pytest==2.7.1
+    pytest>=2.6
 commands =
     py.test {posargs:test_pytest_catchlog.py}