Merge pull request #311 from kevin-brown/travis-matrix

Update Travis CI matrix

Author: juanifioren

.travis.yml

@@ -1,22 +1,16 @@
 language: python
+dist: xenial
+sudo: false
+
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
 
 install:
-  - pip install tox coveralls
-matrix:
-  include:
-    - python: 2.7
-      env:
-          - ENV=docs
-    - python: 2.7
-      env:
-          - ENV=py27-django111
-    - python: 3.5
-      env:
-          - ENV=py35-django111,py35-django20,py35-django21
-    - python: 3.6
-      env:
-          - ENV=py36-django111,py36-django20,py36-django21
+  - pip install tox tox-travis coveralls
 script:
-  - tox -e $ENV
+  - tox
 after_success:
   - coveralls

setup.py

@@ -36,6 +36,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

tox.ini

@@ -1,9 +1,10 @@
 [tox]
 envlist=
-    docs,
+    py27-docs,
     py27-django{111},
     py35-django{111,20,21},
     py36-django{111,20,21},
+    py37-django{111,20,21},
 
 [testenv]
 changedir=
@@ -22,8 +23,7 @@ deps =
 commands =
     pytest --flake8 --cov=oidc_provider {posargs}
 
-[testenv:docs]
-basepython = python2.7
+[testenv:py27-docs]
 changedir = docs
 whitelist_externals =
     mkdir