Upgrade testing

Conflicts: tox.ini
7 years ago · 77306dd25b
parent 664dea65b6
commit 77306dd25b
2 changed files with 12 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -7,10 +7,10 @@ python:
 sudo: false
 matrix:
  include:
-    - python: 2.7
-      script: tox -e docs
-    - python: 2.7
-      script: tox -e lint
+    - python: 3.6
+      env: TOXENV=docs
+    - python: 3.6
+      env: TOXENV=lint
 install:
  - pip install tox-travis
 script:
--- a/tox.ini
+++ b/tox.ini
@ -4,6 +4,13 @@ envlist =
    lint
    docs

+[travis]
+python =
+    2.7: py27
+    3.4: py34
+    3.5: py35
+    3.6: py36
+
 [testenv]
 setenv =
    LANG=C
@ -32,4 +39,4 @@ commands =
    prospector \
    --profile-path={toxinidir} \
    --profile=prospector \
-    --die-on-tool-error
+    --die-on-tool-error {posargs}