From 3f4d4849ca101de1edfeb6959ee8ceccb821251d Mon Sep 17 00:00:00 2001
From: Matthew Neeley <mneeley@gmail.com>
Date: Wed, 2 Jun 2021 21:49:57 -0700
Subject: [PATCH] Test with python 3.9 and 3.10-dev (#379)

Review: @jayich
---
 .travis.yml                       | 7 ++++---
 scripts/test/install-scalabrad.sh | 6 ++++--
 setup.py                          | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd25f1e5..a0947208 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,17 +4,18 @@ sudo: false
 python:
   - "3.7"
   - "3.8"
-  - "3.9-dev"
+  - "3.9"
+  - "3.10-dev"
 matrix:
   allow_failures:
-  - python: "3.9-dev"
+  - python: "3.10-dev"
 install:
   - sed 's/>=/==/' requirements.txt > exact_requirements.txt
   - pip install -r exact_requirements.txt
   - pip install .
   - pip install pytest coveralls
 env:
-  - SCALABRAD_VERSION=0.8.0
+  - SCALABRAD_VERSION=0.8.3
 cache:
   directories:
     - $HOME/scalabrad-$SCALABRAD_VERSION
diff --git a/scripts/test/install-scalabrad.sh b/scripts/test/install-scalabrad.sh
index aeeae54b..f6f488d3 100644
--- a/scripts/test/install-scalabrad.sh
+++ b/scripts/test/install-scalabrad.sh
@@ -3,11 +3,13 @@
 # exit on any error
 set -e
 
-ARCHIVE=scalabrad-${SCALABRAD_VERSION}.tar.gz
+ARCHIVE="scalabrad-${SCALABRAD_VERSION}.tar.gz"
+
+URL_BASE="https://github.com/labrad/scalabrad/releases/download/v${SCALABRAD_VERSION}"
 
 # check to see if scalabrad folder is empty
 if [ ! -d "$HOME/scalabrad-${SCALABRAD_VERSION}/bin" ]; then
-  wget https://bintray.com/artifact/download/labrad/generic/$ARCHIVE -O $HOME/$ARCHIVE;
+  wget "${URL_BASE}/${ARCHIVE}" -O "${HOME}/${ARCHIVE}";
   cd $HOME && tar -xvf $ARCHIVE;
 else
   echo "Using cached scalabrad-${VERSION}.";
diff --git a/setup.py b/setup.py
index e6345657..08fe0575 100644
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@
 Operating System :: OS Independent
 Programming Language :: Python :: 3.7
 Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
 Topic :: Scientific/Engineering"""
 
 import os