Skip to content

Commit

Permalink
Merge 4927560 into fdb61e5
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandunn committed Jun 2, 2020
2 parents fdb61e5 + 4927560 commit 02575a4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
42 changes: 23 additions & 19 deletions .travis.yml
@@ -1,10 +1,8 @@
sudo: required
dist: trusty
dist: xenial

language: java

node_js:
- "13"

env:
- DB=postgres TEST_SUITE=apollo
Expand All @@ -14,21 +12,29 @@ env:
- DB=h2 TEST_SUITE=python-apollo

python:
- 3.6
- "3.7"

node_js:
- "13"

jdk:
- openjdk8

addons:
postgresql: "9.3"
apt:
packages:
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6
#addons:
# postgresql: "9.5"
# apt:
# packages:
# - mysql-server-5.7
# - mysql-client-core-5.7
# - mysql-client-5.7

services:
- postgresql
- mysql
- postgresql
- mysql

before_install:
- "pyenv global 3.7"
- "pip install pip --upgrade"
- npm install -g jshint

before_script:
Expand Down Expand Up @@ -69,16 +75,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
Expand Down
1 change: 1 addition & 0 deletions ChangeLog.md
Expand Up @@ -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

Expand Down

0 comments on commit 02575a4

Please sign in to comment.