From 1b90fed258450f5ed4387e2567a8a88be31b0a86 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Wed, 13 May 2020 13:58:53 +0200
Subject: [PATCH] Travis CI: Test Py38 on Ubuntu Bionic

Related to #1429
---
 .travis.yml | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 96a4810468..6fd03e826f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+os: linux
+dist: bionic  # focal
 language: python
 
 cache:
@@ -23,17 +25,18 @@ jobs:
     - python: 3.7
     - python: 3.8
     - os: linux-ppc64le
-      python: 3.7
+      python: 3.8
       arch: ppc64le
       env:
         - PPC=yes
     - os: linux
-      python: 3.7
+      dist: xenial
+      python: 3.8
       arch: arm64
       env:
         - ARM64=yes
     - os: linux
-      python: 3.7
+      python: 3.8
       env:
         - MANYLINUX_WHL=yes
         - UPLOAD_WHL_PYPI=yes
@@ -51,7 +54,7 @@ jobs:
   # allow_failures:
   #   - python: pypy
   #   - os: linux-ppc64le
-  #   - python: 3.8-dev
+  #   - python: 3.9-dev
 
 before_install:
   - |
@@ -60,7 +63,7 @@ before_install:
       sudo apt-get install python-dev libsdl-image1.2-dev libsdl-mixer1.2-dev \
         libsdl-ttf2.0-dev libsdl1.2-dev python-numpy libportmidi-dev libjpeg-dev \
         libtiff5-dev libx11-6 libx11-dev xfonts-base xfonts-100dpi xfonts-75dpi \
-        xfonts-cyrillic fluid-soundfont-gm musescore-soundfont-gm \
+        xfonts-cyrillic fluid-soundfont-gm timgm6mb-soundfont \
         libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
     fi
 
@@ -128,19 +131,19 @@ after_success:
 
 deploy:
   # https://docs.travis-ci.com/user/deployment/releases/
-  - provider: releases
-    api_key:
-      secure: MzyOmZ6HU16YGuiT66kuTDeGO7Ue+fKCf7HBztuxiHGyVVYdYpDgMIgEKqZ7vAQy9KfdXMzlGkwGesMnOm+i6eU0/USG19yP11ABWJhXe7mv0sGXvQpbMnARARyj73+bSZuNfXrYWOQI9R87LIGqFC3ZEKSgdNdaUQevwW5VG0tEHIeA1FUEL9OTDKsK1KdiG8dwhABZRoC4zak200DwD+1wVyBNSmVBNRa9qRuDeN/MTguqWNLyh1vXSYGB1sl2j0YVWz3uvn/Og0f9tZjcYTZ8/l38Qqvs5EPWmTm8WEtrbYFbPcoctiz1HfQ7ZWi9exJXnNVjguUknJfIsUERZKhqLzR961WI/NRaWtTvKd6RcTYERr+BfvP5nbKryEiifTJKP3OUMKzMAhPPxCp8WPk02lnDAjaxUg6TZ8/lzt6ntDfSfM/50vsN/BRInXU6G4sNb6feklFSpgoqatSKk45V+7jXnCXMmiPbSAdYAcZn/PllFdob7wYOfOED2ynKubZiSI1fRQTdMsUZP0H1Ax5zQpUtEbaXnD1DQRv+UlE0TyQxV4w2D8ZAFKBPxOqDKzODCbJ7fVvUR0SSO0+a8w2rWp2h3MIs+HGDdYII28cM1CHRyqnlMjo6o9eEd/Wi/f5hoL5RkN8OuLUHBLp4mC2D69XI8XzHreigqs1lJgg=
-    file_glob: true
-    file:
-      - dist/*.whl
-    skip_cleanup: true
-    draft: true
-    on:
-      all_branches: true
-      # branches:
-      #   only:
-      #     - master
-      tags: true
-      repo: pygame/pygame
-      condition: $GITHUB_UPLOAD = yes
+  provider: releases
+  token:
+    secure: MzyOmZ6HU16YGuiT66kuTDeGO7Ue+fKCf7HBztuxiHGyVVYdYpDgMIgEKqZ7vAQy9KfdXMzlGkwGesMnOm+i6eU0/USG19yP11ABWJhXe7mv0sGXvQpbMnARARyj73+bSZuNfXrYWOQI9R87LIGqFC3ZEKSgdNdaUQevwW5VG0tEHIeA1FUEL9OTDKsK1KdiG8dwhABZRoC4zak200DwD+1wVyBNSmVBNRa9qRuDeN/MTguqWNLyh1vXSYGB1sl2j0YVWz3uvn/Og0f9tZjcYTZ8/l38Qqvs5EPWmTm8WEtrbYFbPcoctiz1HfQ7ZWi9exJXnNVjguUknJfIsUERZKhqLzR961WI/NRaWtTvKd6RcTYERr+BfvP5nbKryEiifTJKP3OUMKzMAhPPxCp8WPk02lnDAjaxUg6TZ8/lzt6ntDfSfM/50vsN/BRInXU6G4sNb6feklFSpgoqatSKk45V+7jXnCXMmiPbSAdYAcZn/PllFdob7wYOfOED2ynKubZiSI1fRQTdMsUZP0H1Ax5zQpUtEbaXnD1DQRv+UlE0TyQxV4w2D8ZAFKBPxOqDKzODCbJ7fVvUR0SSO0+a8w2rWp2h3MIs+HGDdYII28cM1CHRyqnlMjo6o9eEd/Wi/f5hoL5RkN8OuLUHBLp4mC2D69XI8XzHreigqs1lJgg=
+  file_glob: true
+  file:
+    - dist/*.whl
+  skip_cleanup: true
+  draft: true
+  on:
+    all_branches: true
+    # branches:
+    #   only:
+    #     - master
+    tags: true
+    repo: pygame/pygame
+    condition: $GITHUB_UPLOAD = yes