From 65c802b69e33a3726477064152bf664208cb265f Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 16 Dec 2019 21:02:03 +1000
Subject: [PATCH] do type checking on 3.7, linting on 3.6

- python 3.6 chokes on the pyqt .pyi files
- need to check unit tests on 3.6 as well, as anki/ must run on 3.6
---
 .travis.py36.sh               | 12 ++++++++++++
 .travis.sh => .travis.py37.sh |  3 ---
 .travis.yml                   | 12 ++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100755 .travis.py36.sh
 rename .travis.sh => .travis.py37.sh (84%)

diff --git a/.travis.py36.sh b/.travis.py36.sh
new file mode 100755
index 000000000..4770d7e57
--- /dev/null
+++ b/.travis.py36.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+echo "building ui..."
+./tools/build_ui.sh
+
+echo "running unit tests..."
+nosetests ./tests
+
+echo "linting..."
+./tools/lint.sh
diff --git a/.travis.sh b/.travis.py37.sh
similarity index 84%
rename from .travis.sh
rename to .travis.py37.sh
index e91ac33e2..653f6baa4 100755
--- a/.travis.sh
+++ b/.travis.py37.sh
@@ -11,6 +11,3 @@ nosetests ./tests
 echo "type checking..."
 ./tools/typecheck-setup.sh
 ./tools/typecheck.sh
-
-echo "linting..."
-./tools/lint.sh
diff --git a/.travis.yml b/.travis.yml
index dc40af4cd..b7aac5399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,16 @@
 dist: xenial
 language: python
-python:
-  - "3.6"
-install: 
+os: linux
+install:
   - sudo apt-get update
   - sudo apt-get install portaudio19-dev
   - pip install -r requirements.txt
   - pip install -r requirements.dev
   - pip install pyqt5 pyqtwebengine
 
-script: ./.travis.sh
+jobs:
+  include:
+    - python: 3.6
+      script: ./.travis.py36.sh
+    - python: 3.7
+      script: ./.travis.py37.sh