# HG changeset patch # User lecorguille # Date 1556532540 14400 # Node ID 10315a095169ec1e49ef3921a61ea5febf011468 # Parent 5f0327d6f4740cdbf1e2880b3bfee8be58e26cc5 planemo upload for repository https://github.com/workflow4metabolomics/xcms commit a5136bfc124956893f4f0c91808d1c0d78c4ea01 diff -r 5f0327d6f474 -r 10315a095169 README.rst --- a/README.rst Fri Feb 08 09:57:36 2019 -0500 +++ b/README.rst Mon Apr 29 06:09:00 2019 -0400 @@ -1,9 +1,11 @@ Changelog/News -------------- -**Version 3.4.3.0 - 08/02/2019** +.. _News: https://bioconductor.org/packages/release/bioc/news/xcms/NEWS -- UPGRADE: upgrade the xcms version from 3.0.0 to 3.4.3 +**Version 3.4.4.0 - 08/02/2019** + +- UPGRADE: upgrade the xcms version from 3.0.0 to 3.4.4 (see XCMS News_) **Version 3.0.0.0 - 07/03/2018** diff -r 5f0327d6f474 -r 10315a095169 lib.r --- a/lib.r Fri Feb 08 09:57:36 2019 -0500 +++ b/lib.r Mon Apr 29 06:09:00 2019 -0400 @@ -69,7 +69,7 @@ chromBPI_adjusted_merged <- chromBPI_adjusted } else { if (is(xdata, "XCMSnExp")) xdata_merged <- c(xdata_merged,xdata) - else if (is(xdata, "OnDiskMSnExp")) xdata_merged <- .concatenate_OnDiskMSnExp(xdata_merged,xdata) + else if (is(xdata, "OnDiskMSnExp")) xdata_merged <- xcms:::.concatenate_OnDiskMSnExp(xdata_merged,xdata) else stop("\n\nERROR: The RData either a OnDiskMSnExp object called raw_data or a XCMSnExp object called xdata") singlefile_merged <- c(singlefile_merged,singlefile) @@ -333,7 +333,7 @@ files[exists] <- sub("//","/",files[exists]) # WHAT IS ON THE FILESYSTEM - filesystem_filepaths <- system(paste0("find \"$PWD/",directory,"\" -not -name '\\.*' -not -path '*conda-env*' -type f -name \"*\""), intern=T) + filesystem_filepaths <- system(paste0("find \"",getwd(),"/",directory,"\" -not -name '\\.*' -not -path '*conda-env*' -type f -name \"*\""), intern=T) filesystem_filepaths <- filesystem_filepaths[grep(filepattern, filesystem_filepaths, perl=T)] # COMPARISON diff -r 5f0327d6f474 -r 10315a095169 macros_xcms.xml --- a/macros_xcms.xml Fri Feb 08 09:57:36 2019 -0500 +++ b/macros_xcms.xml Mon Apr 29 06:09:00 2019 -0400 @@ -1,7 +1,7 @@ - 3.4.3 + 3.4.4 bioconductor-xcms diff -r 5f0327d6f474 -r 10315a095169 xcms_plot_chromatogram.xml --- a/xcms_plot_chromatogram.xml Fri Feb 08 09:57:36 2019 -0500 +++ b/xcms_plot_chromatogram.xml Mon Apr 29 06:09:00 2019 -0400 @@ -103,9 +103,11 @@ Changelog/News -------------- -**Version 3.4.3.0 - 08/02/2019** +.. _News: https://bioconductor.org/packages/release/bioc/news/xcms/NEWS -- UPGRADE: upgrade the xcms version from 3.0.0 to 3.4.3 +**Version 3.4.4.0 - 08/02/2019** + +- UPGRADE: upgrade the xcms version from 3.0.0 to 3.4.4 (see XCMS News_) **Version 3.0.0.0 - 07/03/2018**