tox,travis: Add py35, use >= for deps, infer TOXENV from TRAVIS_ENV

.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

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}