Merge pull request #13 from workflow4metabolomics/lecorguille-require…

…ments Remove R and update libjpeg
workflow4metabolomics · Feb 1, 2017 · 3adbd1a · 3adbd1a
2 parents bf9996f + 456d770
commit 3adbd1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,8 @@ before_install:
  - virtualenv planemo-venv
  - . planemo-venv/bin/activate
  - pip install --upgrade pip setuptools
- - pip install planemo
- - planemo conda_init
-
-install:
- - planemo conda_install ${TRAVIS_BUILD_DIR}/galaxy/camera_suite/
+ - pip install planemo==0.37.0
 
 script:
- - planemo test --install_galaxy --no_cache_galaxy --conda_dependency_resolution ${TRAVIS_BUILD_DIR}/galaxy/camera_suite/
+- planemo test --conda_auto_init --conda_auto_install --conda_dependency_resolution --galaxy_branch release_17.01 --no_cache_galaxy ${TRAVIS_BUILD_DIR}/galaxy/camera_suite/
 
diff --git a/galaxy/macro/macros.xml b/galaxy/macro/macros.xml
@@ -2,12 +2,11 @@
 <macros>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="3.1.2">R</requirement>
 	    <requirement type="package" version="0.4_1">r-snow</requirement>
             <requirement type="package" version="1.26.0">bioconductor-camera</requirement>
             <requirement type="package" version="2.26.0">bioconductor-multtest</requirement>
 	    <requirement type="package" version="1.1_4">r-batch</requirement>
-            <requirement type="package" version="1.6.17">libpng</requirement>
+            <requirement type="package" version="1.6.27">libpng</requirement>
             <requirement type="package" version="1.3.20">graphicsmagick</requirement>
         </requirements>
     </xml>