From d72ed4619be513ab1fb1977678d210d59693fa1b Mon Sep 17 00:00:00 2001
From: Andrei Fokau <andrei@5monkeys.se>
Date: Sat, 28 Oct 2017 13:38:16 +0000
Subject: [PATCH] Allow lint failures for now; use py35 for lint and coverage.

---
 .travis.yml | 15 ++++++++-------
 tox.ini     | 22 +++++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d02c9173..49f249c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,23 @@ language: python
 cache: pip
 
 # Tox cannot install pythons, so we set 3.5 as default, use 3.4 already
-# available in container and then include 3.6 in matrix.
+# available in container, and then include 3.6 in matrix.
 python:
   - 3.5
 
 env:
-  - TOXENV=py34
-  - TOXENV=py35
+  matrix:
+    - TOXENV=py34
+    - TOXENV=py35
 
 matrix:
   include:
     - python: 3.6
       env: TOXENV=py36
-    - python: 3.4  # i.e. skip installing 3.5
-      env: TOXENV=lint
-    - python: 3.4
-      env: TOXENV=coverage34
+    - env: TOXENV=coverage
+    - env: TOXENV=lint
+  allow_failures:
+    - env: TOXENV=lint
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 4cdbf7b2..2300ec91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,16 +12,7 @@ commands =
 deps = coverage
 
 [testenv:coverage]
-basepython = python3.4
-skip_install = true
-commands =
-    coverage combine
-    coverage report
-deps =
-    coverage
-
-[testenv:coverage34]
-basepython = python3.4
+basepython = python3.5
 install_command =
     pip install {opts} {packages}
 ignore_errors = True
@@ -34,8 +25,17 @@ commands =
 deps =
     coverage
 
+[testenv:combine_coverage]
+basepython = python3.5
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+deps =
+    coverage
+
 [testenv:lint]
-basepython = python3.4
+basepython = python3.5
 skip_install = true
 commands =
     flake8