From 8dd9ca8944fadedb683901102f220ed2d39aab67 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 27 Sep 2020 21:33:16 +0200
Subject: [PATCH 1/3] Travis CI: Test on Python 3.9 release candidate 2

---
 .travis.yml | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51afd469a..1e5550f5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,36 @@
+os: linux
+dist: xenial
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
+  - "3.9-dev"
   - "pypy"
   - "pypy3"
-dist: trusty
 env:
   - YTDL_TEST_SET=core
   - YTDL_TEST_SET=download
 jobs:
   include:
-    - python: 3.7
-      dist: xenial
-      env: YTDL_TEST_SET=core
-    - python: 3.7
-      dist: xenial
-      env: YTDL_TEST_SET=download
-    - python: 3.8
-      dist: xenial
-      env: YTDL_TEST_SET=core
-    - python: 3.8
-      dist: xenial
-      env: YTDL_TEST_SET=download
-    - python: 3.8-dev
-      dist: xenial
-      env: YTDL_TEST_SET=core
-    - python: 3.8-dev
-      dist: xenial
-      env: YTDL_TEST_SET=download
-    - env: JYTHON=true; YTDL_TEST_SET=core
-    - env: JYTHON=true; YTDL_TEST_SET=download
     - name: flake8
       python: 3.8
-      dist: xenial
       install: pip install flake8
       script: flake8 .
+    - python: 2.6  # test end of life Python version on end of life Trusty
+      dist: trusty
+    - python: 3.2
+      dist: trusty
+    - python: 3,3
+      dist: trusty
+    - python: 3.4
+      dist: trusty
+    - env: JYTHON=true; YTDL_TEST_SET=core
+      dist: trusty
+    - env: JYTHON=true; YTDL_TEST_SET=download
+      dist: trusty
   fast_finish: true
   allow_failures:
     - env: YTDL_TEST_SET=download

From b756aeabc90cdfbcf0feb751208e8422b0d1b2b0 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 27 Sep 2020 21:46:45 +0200
Subject: [PATCH 2/3] Update .travis.yml

---
 .travis.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e5550f5a..a5897dba3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,30 @@ jobs:
       python: 3.8
       install: pip install flake8
       script: flake8 .
-    - python: 2.6  # test end of life Python version on end of life Trusty
+    - python: 2.6  # test end of life veersions of Python on end of life distro Trusty
       dist: trusty
+      env: YTDL_TEST_SET=core
+    - python: 2.6
+      dist: trusty
+      env: YTDL_TEST_SET=download
+    - python: 3.2
+      dist: trusty
+      env: YTDL_TEST_SET=core
     - python: 3.2
       dist: trusty
-    - python: 3,3
+      env: YTDL_TEST_SET=download
+    - python: 3.3
+      dist: trusty
+      env: YTDL_TEST_SET=core
+    - python: 3.3
       dist: trusty
+      env: YTDL_TEST_SET=download
     - python: 3.4
       dist: trusty
+      env: YTDL_TEST_SET=core
+    - python: 3.4
+      dist: trusty
+      env: YTDL_TEST_SET=download
     - env: JYTHON=true; YTDL_TEST_SET=core
       dist: trusty
     - env: JYTHON=true; YTDL_TEST_SET=download
@@ -34,8 +50,6 @@ jobs:
   fast_finish: true
   allow_failures:
     - env: YTDL_TEST_SET=download
-    - env: JYTHON=true; YTDL_TEST_SET=core
-    - env: JYTHON=true; YTDL_TEST_SET=download
 before_install:
   - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi
 script: ./devscripts/run_tests.sh

From 2b140a9f60a425635b1632e7da581845ae090bc9 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 27 Sep 2020 21:49:33 +0200
Subject: [PATCH 3/3] Update .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index a5897dba3..2ed4f26f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,7 @@ jobs:
   fast_finish: true
   allow_failures:
     - env: YTDL_TEST_SET=download
+    - env: JYTHON=true; YTDL_TEST_SET=download
 before_install:
   - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi
 script: ./devscripts/run_tests.sh