Added Python 3.5 to tox and Travis configuration

diff --git a/.travis.yml b/.travis.yml
index 0881b19dcedf1bc129b08097a4465456086de3de..8e2ea0b1f6357d9e27ff2138f8bc108b2dbbc80e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,13 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5.0"
 
 install:
     - pip install tox
 script:
     - tox -e \
-      $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')
+      $(echo $TRAVIS_PYTHON_VERSION | sed 's/^\([0-9]\)\.\([0-9]\).*/py\1\2/')
 
 notifications:
   email: false

diff --git a/tox.ini b/tox.ini
index d5079b934b17136c29c206e6e01f797310759d00..0daabf75b6160d48260004172803a92cf8c8dadc 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34
+envlist = py26, py27, pypy, py33, py34, py35
 
 [testenv]
 commands =