fix testing of python 3.5 on Travis

Changaco · Jun 10, 2018 · 6b20c4b · 6b20c4b
1 parent e69b39e
commit 6b20c4b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,10 @@
 language: python
-python: "3.6"
+matrix:
+  include:
+    - python: 3.5
+      env: TOXENV=py27,py34,py35
+    - python: 3.6
+      env: TOXENV=py36
 
 branches:
   only:
@@ -24,7 +29,7 @@ before_install:
 
 install: pip install tox
 
-script: tox -e py36
+script: tox
 
 notifications:
   email: false

diff --git a/tox.ini b/tox.ini
@@ -1,20 +1,16 @@
 [tox]
-envlist=lint,py27,py34,py35,py36
+envlist=py27,py34,py35,py36
 skipsdist=True
 
 [testenv]
 passenv = LIBARCHIVE
 commands=
     python -m pytest -vv --boxed --cov libarchive --cov-report term-missing {toxinidir}/tests {posargs}
+    flake8 {toxinidir}
 deps=
+    flake8
     pytest
     pytest-cov
     pytest-xdist
     six
     mock
-
-[testenv:lint]
-commands=
-    flake8 {toxinidir}
-deps=
-    flake8