summaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml37
1 files changed, 27 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index c6ef2609..4f67934d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,31 @@
language: python
-python:
- - "3.5" # Python 3.5 still needs to be installed on Travis-CI
-
-env:
- - TOX_ENV=py27
- - TOX_ENV=py34
- - TOX_ENV=py35
- - TOX_ENV=pypy26
- - TOX_ENV=pycodestyle
- - TOX_ENV=autopep8
+
+matrix:
+ include:
+ - python: 3.6
+ env: TOX_ENV=pycodestyle
+ - python: 3.6
+ env: TOX_ENV=py36
+ - python: 3.6
+ env: TOX_ENV=autopep8
+
+ - python: 2.7
+ env: TOX_ENV=pycodestyle
+ - python: 2.7
+ env: TOX_ENV=py27
+
+ - python: 3.4
+ env: TOX_ENV=py34
+
+ - python: 3.5
+ env: TOX_ENV=py35
+
+ - python: 3.7-dev
+ env: TOX_ENV=py37
+
+# This is disabled because of trouble running on travis CI.
+# - python: pypy
+# env: TOX_ENV=pypy
services:
- docker