From 8501cefdacbc0f445cdf41cd902e9c91ed9010c4 Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Mon, 3 Feb 2020 10:05:20 -0800
Subject: [PATCH] Update Travis to Bionic and Python 3.6 (#585)

---
 .travis.yml         | 17 +++++------------
 Tools/run_travis.sh |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1fb39cd17c..20635456d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
-language: csharp
-
-dist: trusty
+language: generic
+dist: bionic
 sudo: false
-mono: none
-# dotnet: 3.1.100 # Travis is shitting itself right now and it can't locate .NET Core packages.
 
 os:
 - linux
@@ -11,11 +8,8 @@ os:
 
 addons:
   apt:
-    #sources:
-    #- deadsnakes
-
     packages:
-    - python3.5
+    - python3
     - python3-pip
 
 cache:
@@ -30,9 +24,8 @@ install:
 #  - if [ $TRAVIS_OS_NAME = osx ]; then brew update && brew upgrade python; fi
 
 before_script:
-#- "if [ $TRAVIS_OS_NAME = linux ]; then pyenv shell 3.6; fi"
-- "python3.5 -m pip install --user requests"
-- "python3.5 RUN_THIS.py --no-prompt"
+- "python3.6 -m pip install --user requests"
+- "python3.6 RUN_THIS.py --no-prompt"
 
 script:
 - "Tools/run_travis.sh"
diff --git a/Tools/run_travis.sh b/Tools/run_travis.sh
index bd7ee52459..d1b6ee8129 100755
--- a/Tools/run_travis.sh
+++ b/Tools/run_travis.sh
@@ -6,6 +6,6 @@ set -e
 # Travis is shitting itself. Wonderful.
 PATH="~/.dotnet:$PATH"
 
-dotnet build SpaceStation14.sln /p:Python=python3.5
+dotnet build SpaceStation14.sln /p:Python=python3.6
 dotnet test Content.Tests/Content.Tests.csproj
 dotnet test Content.IntegrationTests/Content.IntegrationTests.csproj