From 0638837b9b10f996f02a506f8ae9ba51282f3f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gildas=20Le=20Corguill=C3=A9?= Date: Fri, 17 May 2019 20:29:19 +0200 Subject: [PATCH 1/2] Update macros.xml --- galaxy/probmetab/macros.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galaxy/probmetab/macros.xml b/galaxy/probmetab/macros.xml index 187cf4b..7b166c0 100644 --- a/galaxy/probmetab/macros.xml +++ b/galaxy/probmetab/macros.xml @@ -2,9 +2,9 @@ - r-snow - r-probmetab - r-batch + r-snow + r-probmetab + r-batch From ddca3afb431bcc5564746ab89d71c402b6165c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gildas=20Le=20Corguill=C3=A9?= Date: Fri, 17 May 2019 20:31:05 +0200 Subject: [PATCH 2/2] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4fc6d3..469b2e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ before_install: - sudo apt-get install -y python-virtualenv - virtualenv planemo-venv - . planemo-venv/bin/activate - - pip install --upgrade pip setuptools - - pip install planemo==0.37.0 + - pip install planemo script: - planemo lint ${TRAVIS_BUILD_DIR}/galaxy/probmetab - - travis_wait 40 planemo test --conda_auto_init --conda_auto_install --conda_dependency_resolution --galaxy_branch release_17.01 --no_cache_galaxy ${TRAVIS_BUILD_DIR}/galaxy/probmetab + - travis_wait 40 planemo test --galaxy_branch release_18.05 --no_cache_galaxy ${TRAVIS_BUILD_DIR}/galaxy/probmetab