Merge pull request #51 from pyca/alex-patch-1

Added python3.5

2 files changed, 31 insertions, 16 deletions

diff --git a/.travis.yml b/.travis.yml
index 5a1e060..1656377 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,21 +2,36 @@ language: python
 # Run on Travis CI's docker infrastructure
 sudo: false
 
-env:
-  # We have to explicitly use the CC arguments here because Travis does not
-  # support the compiler directive with language: python.
-  - TOXENV=py26 CC=gcc
-  - TOXENV=py27 CC=gcc
-  - TOXENV=py33 CC=gcc
-  - TOXENV=py34 CC=gcc
-  - TOXENV=pypy CC=gcc
-  - TOXENV=py26 CC=clang
-  - TOXENV=py27 CC=clang
-  - TOXENV=py33 CC=clang
-  - TOXENV=py34 CC=clang
-  - TOXENV=pypy CC=clang
-  - TOXENV=pep8
-  - TOXENV=py3pep8
+matrix:
+  include:
+    - python: 2.6
+      env: TOXENV=py26 CC=gcc
+    - python: 2.7
+      env: TOXENV=py27 CC=gcc
+    - python: 3.3
+      env: TOXENV=py33 CC=gcc
+    - python: 3.4
+      env: TOXENV=py34 CC=gcc
+    - python: 3.5
+      env: TOXENV=py35 CC=gcc
+    - python: pypy
+      env: TOXENV=pypy CC=gcc
+    - python: 2.6
+      env: TOXENV=py26 CC=clang
+    - python: 2.7
+      env: TOXENV=py27 CC=clang
+    - python: 3.3
+      env: TOXENV=py33 CC=clang
+    - python: 3.4
+      env: TOXENV=py34 CC=clang
+    - python: 3.5
+      env: TOXENV=py35 CC=clang
+    - python: pypy
+      env: TOXENV=pypy CC=clang
+    - python: 2.7
+      env: TOXENV=pep8
+    - python: 3.5
+      env: TOXENV=py3pep8
 
 install: .travis/install.sh
 
diff --git a/tox.ini b/tox.ini
index 93db7b3..abc6283 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py33,py34,pep8,py3pep8
+envlist = py26,py27,pypy,py33,py34,py35,pep8,py3pep8
 
 [testenv]
 # If you add a new dep here you probably need to add it in setup.py as well