From 1be5c333332d214070c81a2306d1132716fa6d00 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Fri, 20 Jul 2018 18:40:44 -0400
Subject: [PATCH 1/3] Avoid unnecessarily setting env variables on the lint
 build

The relevent env variables are set for the matrix builds, and are irrelevant
to the lint build. By default the first matrix entry is applied.

"Each job included in jobs.include inherits the first value of the array that defines a matrix dimension."
https://docs.travis-ci.com/user/build-stages/#Build-Stages-and-Build-Matrix-Expansion
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 901334d9b..acc2adbad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,7 @@ after_script:
 jobs:
   include:
     - stage: lint
+      env:
       sudo: false
       cache: false
       addons:

From 515348f7043f712cf2410bf111240660d389bbb4 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Sat, 21 Jul 2018 12:52:09 -0400
Subject: [PATCH 2/3] Don't unnecessarily install shellcheck on the lint build

"Travis CI has now integrated ShellCheck by default, so you don't need to manually install it."
https://github.com/koalaman/shellcheck#travis-ci
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index acc2adbad..6eba9fddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,6 @@ jobs:
         apt:
           packages:
             - python3-pip
-            - shellcheck
       install:
         - travis_retry pip3 install flake8 --user
       before_script:

From 751c9587d42b4c603ef85e5e846a96b2e9dd7590 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Sat, 21 Jul 2018 12:53:50 -0400
Subject: [PATCH 3/3] Use the Travis python language feature on the lint build

Rather than installing python via apt.

https://docs.travis-ci.com/user/languages/python/
---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6eba9fddd..1e6fc0a51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,12 +84,10 @@ jobs:
       env:
       sudo: false
       cache: false
-      addons:
-        apt:
-          packages:
-            - python3-pip
+      language: python
+      python: '3.6'
       install:
-        - travis_retry pip3 install flake8 --user
+        - travis_retry pip install flake8
       before_script:
         - git fetch --unshallow
       script: