From d6e91df208d7abcd8075296e241002ad4784833d Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 16:30:57 +0200
Subject: [PATCH 1/8] Updates to the travis script

---
 .travis.yml | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 873ded23..704d96d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,14 @@ services:
   - xvfb
 language: python
 cache: bundler
+
 addons:
   apt:
     packages:
       - libenchant-dev
       - python3-pyqt5
       - python3-pyqt5.qtsvg
-python:
-  - "3.6"
-  - "3.7"
-  - "3.8"
+
 install:
   - pip install --upgrade pip
   - pip install -r requirements.txt
@@ -23,10 +21,26 @@ install:
   - pip install pytest-cov
   - pip install pytest-qt
   - pip install codecov
-script:
-  - python -m pytest --cov=nw -m "project|core|gui" -v
-after_success:
-  - codecov
-after_failure:
-  - cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
 
+stages:
+  - name: Initial
+  - name: Full
+
+jobs:
+  include:
+    - stage: Initial
+      python:
+        - 3.8
+      script:
+        - python -m pytest --cov=nw -m "project|core|gui" -v
+      after_success:
+        - codecov
+      after_failure:
+        - cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
+
+    - stage: Full
+      python:
+        - 3.6
+        - 3.7
+      script:
+        - python -m pytest --cov=nw -m "project|core|gui" -v

From e8ad068a4296d355218b9896878a7e33a58aa038 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 16:43:06 +0200
Subject: [PATCH 2/8] Another try at getting 3.7 to run

---
 .travis.yml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 704d96d4..84c57f36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,18 +29,12 @@ stages:
 jobs:
   include:
     - stage: Initial
-      python:
-        - 3.8
-      script:
-        - python -m pytest --cov=nw -m "project|core|gui" -v
-      after_success:
-        - codecov
-      after_failure:
-        - cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
+      python: 3.8
+      script: python -m pytest --cov=nw -m "project|core|gui" -v
+      after_success: codecov
+      after_failure: cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
 
     - stage: Full
-      python:
-        - 3.6
-        - 3.7
-      script:
-        - python -m pytest --cov=nw -m "project|core|gui" -v
+      python: 3.6
+    - python: 3.7
+      script: python -m pytest -m "project|core|gui" -v

From 71d908fa3ebc52b46c2817d4f179fd4b45fb48c7 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 16:52:28 +0200
Subject: [PATCH 3/8] Fixed 3.6 and added 3.9

---
 .travis.yml | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 84c57f36..561951f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,23 +18,41 @@ install:
 # - pip install pytest-faulthandler
   - pip install PyVirtualDisplay
   - pip install pytest-xvfb
-  - pip install pytest-cov
   - pip install pytest-qt
-  - pip install codecov
 
 stages:
-  - name: Initial
-  - name: Full
+  - name: Main
+  - name: Supported
 
 jobs:
   include:
-    - stage: Initial
-      python: 3.8
-      script: python -m pytest --cov=nw -m "project|core|gui" -v
-      after_success: codecov
-      after_failure: cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
+    - stage:
+      - Main
+      python:
+      - 3.8
+      install:
+      - pip install pytest-cov
+      - pip install codecov
+      script:
+      - python -m pytest --cov=nw -m "project|core|gui" -v
+      after_success:
+      - codecov
+      after_failure:
+      - cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
 
-    - stage: Full
-      python: 3.6
-    - python: 3.7
-      script: python -m pytest -m "project|core|gui" -v
+    - stage:
+      - Supported
+      python:
+      - 3.6
+      script:
+      - python -m pytest -m "project|core|gui" -v
+
+    - python:
+      - 3.7
+      script:
+      - python -m pytest -m "project|core|gui" -v
+
+    - python:
+      - 3.9-dev
+      script:
+      - python -m pytest -m "project|core|gui" -v

From 59e588ebf571af9e7946d1b512fd899f14dde0e5 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 16:58:01 +0200
Subject: [PATCH 4/8] Move the install commands back

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 561951f3..b2ffa4a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,13 @@ addons:
       - python3-pyqt5.qtsvg
 
 install:
-  - pip install --upgrade pip
+# - pip install --upgrade pip
   - pip install -r requirements.txt
-# - pip install pytest-faulthandler
   - pip install PyVirtualDisplay
+  - pip install pytest-cov
   - pip install pytest-xvfb
   - pip install pytest-qt
+  - pip install codecov
 
 stages:
   - name: Main
@@ -30,9 +31,6 @@ jobs:
       - Main
       python:
       - 3.8
-      install:
-      - pip install pytest-cov
-      - pip install codecov
       script:
       - python -m pytest --cov=nw -m "project|core|gui" -v
       after_success:

From 9922efda77b765e3e6b4542093fab6a77a01f2ff Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 17:06:05 +0200
Subject: [PATCH 5/8] Trying different packages

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2ffa4a2..5d7fbf31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,11 @@ addons:
       - libenchant-dev
       - python3-pyqt5
       - python3-pyqt5.qtsvg
+      - python3-lxml
 
 install:
 # - pip install --upgrade pip
-  - pip install -r requirements.txt
+# - pip install -r requirements.txt
   - pip install PyVirtualDisplay
   - pip install pytest-cov
   - pip install pytest-xvfb
@@ -32,7 +33,7 @@ jobs:
       python:
       - 3.8
       script:
-      - python -m pytest --cov=nw -m "project|core|gui" -v
+      - python -m pytest --cov=nw -v
       after_success:
       - codecov
       after_failure:
@@ -43,14 +44,14 @@ jobs:
       python:
       - 3.6
       script:
-      - python -m pytest -m "project|core|gui" -v
+      - python -m pytest -v
 
     - python:
       - 3.7
       script:
-      - python -m pytest -m "project|core|gui" -v
+      - python -m pytest -v
 
     - python:
       - 3.9-dev
       script:
-      - python -m pytest -m "project|core|gui" -v
+      - python -m pytest -v

From 7eabb7a1f4611ae468cbd68e3e191af7837d8704 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 17:09:30 +0200
Subject: [PATCH 6/8] That did not work

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5d7fbf31..af892e46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ addons:
 
 install:
 # - pip install --upgrade pip
-# - pip install -r requirements.txt
+  - pip install -r requirements.txt
   - pip install PyVirtualDisplay
   - pip install pytest-cov
   - pip install pytest-xvfb
@@ -25,6 +25,8 @@ install:
 stages:
   - name: Main
   - name: Supported
+  - name: Future
+#   if: branch = main
 
 jobs:
   include:
@@ -51,7 +53,9 @@ jobs:
       script:
       - python -m pytest -v
 
-    - python:
+    - stage:
+      - Future
+      python:
       - 3.9-dev
       script:
       - python -m pytest -v

From d5b7c027fb47ceac5f9d62cfaf6f6353ffc04dec Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 17:18:42 +0200
Subject: [PATCH 7/8] Added conditional for future test stage

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af892e46..4e0f2cf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ stages:
   - name: Main
   - name: Supported
   - name: Future
-#   if: branch = main
+    if: branch = main
 
 jobs:
   include:

From 6a664a1890066e82d2ee261aaf8ce93b3a62611e Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 17:23:52 +0200
Subject: [PATCH 8/8] Drop 3.9 for now as it takes too long to build
 dependencies

---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e0f2cf7..eb85544e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@ install:
 stages:
   - name: Main
   - name: Supported
-  - name: Future
-    if: branch = main
+# - name: Future
+#   if: branch = main
 
 jobs:
   include:
@@ -53,9 +53,9 @@ jobs:
       script:
       - python -m pytest -v
 
-    - stage:
-      - Future
-      python:
-      - 3.9-dev
-      script:
-      - python -m pytest -v
+#   - stage:
+#     - Future
+#     python:
+#     - 3.9-dev
+#     script:
+#     - python -m pytest -v