Merge branch 'feature/python3.5-support' into feature/native-qr

2016-03-20 00:52:05 +11:00 · 2016-03-20 00:52:05 +11:00 · 0c1e9fc34b
parent 73854e999a 8596148271
commit 0c1e9fc34b
1 changed files with 9 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +1,16 @@
 language: python
 sudo: false
 cache: pip
+matrix:
+  include:
+  - python: 2.7
+    env: TOXENV=py27
+  - python: 3.4
+    env: TOXENV=py34
+  - python: 3.5
+    env: TOXENV=py35
 before_install:
    - pip install tox
 # command to run tests
 script:
-    - tox
+    - tox