Merge branch 'develop' into fix-2488

.travis.yml

@@ -1,10 +1,8 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 language: java
 
-node_js:
-  - "13"
 
 env:
   - DB=postgres TEST_SUITE=apollo
@@ -14,21 +12,21 @@ env:
   - DB=h2 TEST_SUITE=python-apollo
 
 python:
-  - 3.6
+  - "3.7"
+
+node_js:
+  - "13"
 
-addons:
-  postgresql: "9.3"
-  apt:
-    packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+jdk:
+  - openjdk8
 
 services:
-- postgresql
-- mysql
+  - postgresql
+  - mysql
 
 before_install:
+  - "pyenv global 3.7"
+  - "pip install pip --upgrade"
   - npm install -g jshint
 
 before_script:
@@ -69,16 +67,14 @@ script:
       ./grailsw run-app &
       git clone --single-branch --branch 4.1 --depth=1 https://github.com/galaxy-genome-annotation/python-apollo
       cd python-apollo
-	  pyenv install 3.6.3
-      pyenv global 3.6.3
       sed -i 's|8888|8080/apollo|' `pwd`/test-data/arrow.yml
       export ARROW_GLOBAL_CONFIG_PATH=`pwd`/test-data/arrow.yml
-      virtualenv .venv
+      python3 -m venv .venv
       . .venv/bin/activate
-      pip install .
-      pip install nose
+      pip3 install .
+      pip3 install nose
       ./bootstrap_apollo.sh --nodocker
-      python setup.py nosetests
+      python3 setup.py nosetests
       killall java || true
     fi
 

ChangeLog.md

@@ -4,6 +4,7 @@
 Infrastructure Changes
 
 - Upgrade to [JBrowse 1.16.9](https://github.com/GMOD/jbrowse/releases/tag/1.16.9) / [2489](https://github.com/GMOD/Apollo/pull/2489).  
+- Fixed python dependency for travis for BioPython (3.7) and upgraded to Xenial [2493](https://github.com/GMOD/Apollo/pull/2493).
 
 Bug Fixes
 

README.md

@@ -96,3 +96,4 @@ YourKit is the creator of <a href="https://www.yourkit.com/java/profiler/">YourK
 and <a href="https://www.yourkit.com/youmonitor/">YourKit YouMonitor</a>.
 
 
+