Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metams #275

Open
wants to merge 206 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
dda8940
first commit
yguitton May 22, 2016
a6fba2a
Update README.md
yguitton May 22, 2016
3c2f1fe
first commit
yguitton May 22, 2016
d6abb85
Update README.md
yguitton May 22, 2016
4a88b69
Create .shed.yml
yguitton May 22, 2016
8406bdc
Create test.txt
yguitton May 22, 2016
5632815
still erros
yguitton May 22, 2016
867bc2b
Create tool_dependencies.xml
yguitton May 22, 2016
85a3ef4
Update README.md
lecorguille Jul 5, 2016
a9fd8f3
Merge pull request #1 from workflow4metabolomics/lecorguille-fix-doc
lecorguille Jul 10, 2016
b2bede5
first commit
yguitton Jul 11, 2016
bcbc6d7
cosmetic changes
lecorguille Jul 11, 2016
5750f1a
conda OK ; planemo OK
lecorguille Jul 11, 2016
a9ec218
add doc
lecorguille Jul 11, 2016
99ea2b3
Merge pull request #2 from workflow4metabolomics/dev_planemo_conda
lecorguille Jul 11, 2016
08d5de9
planemo lint
lecorguille Jul 11, 2016
f5df117
rename the tool
lecorguille Jul 11, 2016
5e5a18b
Textual Details for RI option + YGU email update
yguitton Jul 12, 2016
5a49c17
add some test-data
lecorguille Jul 13, 2016
6384fcf
Update metams_runGC.xml
lecorguille Jul 13, 2016
d3ed8ce
Add Metabolomics tag in Galaxy toolshed descriptions.
pkrog Jul 28, 2016
f6cc2c6
Update .travis.yml
lecorguille Jul 28, 2016
a47dbc8
Merge pull request #7 from workflow4metabolomics/dev-toolshed
lecorguille Jul 28, 2016
abce9a2
Add credit to Ralf for base script
yguitton Sep 5, 2016
e86b491
Bug correction in plotUnknown if no peak found
yguitton Sep 8, 2016
006eacc
version update after bug correction
yguitton Sep 8, 2016
720c352
add make.names in sampleMetadata
yguitton Apr 13, 2017
18e0d03
try to solve travis error
yguitton Apr 25, 2017
c7ff5c2
Travis update
lecorguille May 10, 2017
2c0900d
new files test-data all default
yguitton May 15, 2017
56f80e2
version 2.0 with RI filter
yguitton May 15, 2017
da81a1b
version 2.0 update
yguitton May 15, 2017
d282d0e
New version 2.0 with RI search modified
yguitton May 19, 2017
8bbbd8e
Merge pull request #16 from workflow4metabolomics/fix_travis
yguitton May 19, 2017
e64fd8e
add relative link management functions
yguitton May 30, 2017
be48065
add minutes or seconds to title, add none option to plotUnknowns
yguitton Jun 2, 2017
0b816a8
Add try to plotUnknown if error generate empty pdf
yguitton Jun 2, 2017
71038a1
update to 2.1.1 as in production
yguitton Oct 16, 2017
a69ca6d
add make.names in sampleMetadata
yguitton Nov 8, 2017
d14f40d
Add files via upload
yguitton Nov 8, 2017
5324fcb
increase planemo and galaxy version in travis tests
lecorguille Feb 16, 2018
fa0896f
Update metams_runGC.xml
lecorguille Mar 2, 2018
12635dd
Update metams_runGC.xml
lecorguille Sep 18, 2018
074e7f4
Update metams_runGC.xml
lecorguille Sep 18, 2018
d55838e
Merge pull request #24 from workflow4metabolomics/fix_tarvis2
lecorguille Oct 10, 2018
e9f7761
Remake tree files
May 20, 2019
024b2c9
add travis and git files
May 20, 2019
782ede9
Add metaMS_plot
May 20, 2019
2fd65c6
Rename macros
May 20, 2019
13d25a6
update test files
May 20, 2019
62c9f54
update file metaMS_runGC
May 20, 2019
20a2c85
adapt symlink tests
May 20, 2019
d28c776
Modify R script for runGC
May 21, 2019
5c1d240
Revert "Modify R script for runGC"
May 21, 2019
3b9b47e
Update R script for runGC
May 21, 2019
b4b9915
Rename file
May 21, 2019
d596199
Update xml runGC file
May 21, 2019
3768ea7
Update tests runGC
May 21, 2019
0103a37
Update README runGC
May 21, 2019
d98cd8c
Change path for lib and macro symlinks
May 21, 2019
b2060ff
Update lib.r
May 21, 2019
6737e29
Correct one mistake
May 21, 2019
7fc96f8
Change little travis test
May 21, 2019
ee18ff5
update tests plot
May 21, 2019
b782f4f
little change
May 21, 2019
776286f
update readmes
May 21, 2019
c10088c
change indentation
May 22, 2019
f4fc151
little fix
May 22, 2019
74e0b52
fix
May 22, 2019
f3ae47a
update readme
May 22, 2019
b90b7fe
few reviews
Jun 3, 2019
6bf0c30
correct indentation
Jun 3, 2019
71d71ef
modify tests conditionals
Jun 3, 2019
1f843e3
delete log file
Jun 3, 2019
b025b15
resolve indentation
Jun 3, 2019
ed29d32
try test
Jun 3, 2019
32612f9
add conda
Jun 3, 2019
90a5856
modify GS
Jun 3, 2019
b021188
try GS
Jun 3, 2019
2f3e59f
adapt test datas
Jun 4, 2019
737a14a
modify name
Jun 4, 2019
19012b4
modify name
Jun 4, 2019
3a0b030
update tests
Jun 4, 2019
12dee9f
change name
Jun 4, 2019
0ac2fb8
update tests
Jun 4, 2019
107c0dd
Remake tree files
May 20, 2019
3f7a8cc
add travis and git files
May 20, 2019
15d62b1
Add metaMS_plot
May 20, 2019
f8482ee
Rename macros
May 20, 2019
e5d1fb0
update test files
May 20, 2019
285d673
update file metaMS_runGC
May 20, 2019
adb4f83
adapt symlink tests
May 20, 2019
ca79779
Modify R script for runGC
May 21, 2019
012d49b
Revert "Modify R script for runGC"
May 21, 2019
6cab746
Update R script for runGC
May 21, 2019
b4b4258
Rename file
May 21, 2019
d996f6c
Update xml runGC file
May 21, 2019
b6cde76
Update tests runGC
May 21, 2019
c1f4900
Update README runGC
May 21, 2019
6ebd725
Change path for lib and macro symlinks
May 21, 2019
52fcdd5
Update lib.r
May 21, 2019
db83b13
Correct one mistake
May 21, 2019
948e26c
Change little travis test
May 21, 2019
5279b82
update tests plot
May 21, 2019
89eaaed
little change
May 21, 2019
5f3a525
update readmes
May 21, 2019
1f64d0c
change indentation
May 22, 2019
14f90b0
little fix
May 22, 2019
0b45662
fix
May 22, 2019
5870cf7
update readme
May 22, 2019
2566d5d
few reviews
Jun 3, 2019
08d4675
correct indentation
Jun 3, 2019
f7c768c
modify tests conditionals
Jun 3, 2019
7df4e9e
delete log file
Jun 3, 2019
1080698
resolve indentation
Jun 3, 2019
c78e3e3
try test
Jun 3, 2019
a323b29
add conda
Jun 3, 2019
5d59cdf
modify GS
Jun 3, 2019
a432378
try GS
Jun 3, 2019
4833be6
adapt test datas
Jun 4, 2019
093bb79
modify name
Jun 4, 2019
56907c1
modify name
Jun 4, 2019
68f86d6
update tests
Jun 4, 2019
5ecb9c0
change name
Jun 4, 2019
18b2e4c
update tests
Jun 4, 2019
afe107b
adjust
Jun 4, 2019
b258f4f
some changes
Jun 4, 2019
50df3ca
try update tests
Jun 4, 2019
4b1594b
delete log files
Jun 4, 2019
87d62d8
try pictures
Jun 5, 2019
cd82b5e
try gs test
Jun 5, 2019
05e48b7
update shebang, tests plot
Jun 5, 2019
8f07cf5
add gs in xml
Jun 12, 2019
34fac2c
delete gs in travis
Jun 12, 2019
2b91cbe
Merge pull request #29 from jsaintvanne/fix_zip
lecorguille Jun 12, 2019
108f461
change owner metams_rungc
Jun 12, 2019
0c2cdfe
change owner shed
Jun 12, 2019
0cc0982
some readme
Jun 13, 2019
5b00108
change id
Jun 13, 2019
245d14f
just a change
Jun 13, 2019
40fcf1f
change names
Jun 14, 2019
174a171
Merge pull request #32 from jsaintvanne/fix_zip
lecorguille Jun 14, 2019
11bb57e
add warning for cdf issue
Jul 16, 2019
65f2b20
Correction for TIC and BPC from cdf files
Jul 17, 2019
9f02a93
corection when 1 file
Aug 12, 2019
927355b
some changes
Aug 13, 2019
bbeef8c
change data test
Aug 20, 2019
941411e
change
Aug 21, 2019
7eb2b73
change data test after change DB a little
Aug 21, 2019
02696ce
add to delete
Aug 21, 2019
96beb44
wrong branch
Aug 21, 2019
59db499
wrong branch
Aug 21, 2019
82c92db
correction changes
Aug 21, 2019
942e68a
update data tests
Aug 21, 2019
b342e9e
update tests
Aug 21, 2019
a7a6b82
Merge pull request #35 from jsaintvanne/correct1file
lecorguille Sep 2, 2019
2092ad3
Merge branch 'dev' into dev
jsaintvanne Sep 3, 2019
37843bc
unpdate BPC
jsaintvanne Sep 3, 2019
b301f1d
Merge pull request #38 from jsaintvanne/dev
lecorguille Sep 3, 2019
3bd7cb8
add warning for CDF and result null correction
Sep 3, 2019
c7a5186
delete correct null result
Sep 3, 2019
c47a014
Merge pull request #41 from jsaintvanne/dev
lecorguille Sep 5, 2019
9a8ce51
change pictures
Nov 5, 2019
2efb673
delete fwhm
jsaintvanne Jan 27, 2020
e45407a
delete fwhm param
jsaintvanne Jan 27, 2020
a89b822
Merge pull request #43 from jsaintvanne/dev
jsaintvanne Jan 27, 2020
d7053e6
change metams version
Apr 28, 2020
f244104
change rbatch version
Apr 28, 2020
006bb51
versionning with macro
Apr 29, 2020
8235214
corrections for versionning
Apr 29, 2020
a03f793
correction of double space in DB
Apr 30, 2020
cb9c6a3
move authors and citations as macros
Apr 30, 2020
df5fc6d
change authors and citations with macro
Apr 30, 2020
26fde20
correction of double spaces again
Apr 30, 2020
59950a3
update runGC test data
May 6, 2020
67453d7
update macro authors for planemo lint
May 6, 2020
eb45457
put TODO in an isue
May 6, 2020
1b3cc6c
Merge pull request #45 from jsaintvanne/dev
lecorguille May 6, 2020
74ecf53
Full remove of fwhmparam not needed anymore
yguitton Jun 18, 2020
b3def33
Merge pull request #47 from workflow4metabolomics/dev.fwhmparam
yguitton Jun 26, 2020
88163f9
tool version update
yguitton Jul 2, 2020
0030bc9
Update macro.xml to use metaMS R package version 1.24.0
yguitton Jul 15, 2020
da591ff
change Travis branch target to dev
yguitton Jul 15, 2020
5f41ab4
Update version
gallardoalba Feb 13, 2022
0f4e17c
Merge pull request #50 from gallardoalba/Update_metaMS_version
yguitton Feb 14, 2022
4444c59
Prep migration
lecorguille Oct 6, 2024
8a10f2a
Merge remote-tracking branch 'metams/prep_migration'
lecorguille Oct 6, 2024
7d9c621
change links in help section of runGC tool for lint errors
jsaintvanne Oct 8, 2024
b9aeb59
change links in help section of runGC tool for lint errors second test
jsaintvanne Oct 8, 2024
e9a0367
change version name
jsaintvanne Oct 8, 2024
fd571f0
change version name test 2
jsaintvanne Oct 8, 2024
65568c2
correct test of plot tool with expect_num_outputs
jsaintvanne Oct 8, 2024
d3b6bd2
mv metams in tools folder
lecorguille Oct 9, 2024
217570f
Try to correct the indentation problem with lintr
DamienCode404 Oct 23, 2024
0f42d95
Lintr error corrections
DamienCode404 Oct 23, 2024
bc6be48
Lintr : Commented code should be removed.
DamienCode404 Oct 23, 2024
ae422d3
fix: Test input file cannot be found.
DamienCode404 Nov 8, 2024
7d8000d
refactor: Change of structure for metams tool
DamienCode404 Nov 8, 2024
6c7f5fe
refactor: change test files (>1M) and update code base
DamienCode404 Nov 13, 2024
c2ba93e
Fix: Rename file with lower-case character
DamienCode404 Nov 14, 2024
aa882ad
fix: Tool version with PEP 440
DamienCode404 Nov 14, 2024
c284f8f
fix: Tool versioning
DamienCode404 Nov 14, 2024
769e93d
test-data: rungc
DamienCode404 Nov 14, 2024
5274459
test-data: metams_plot
DamienCode404 Nov 14, 2024
16ec8dd
fix: try with no single string in command rscript
DamienCode404 Nov 14, 2024
b56771e
fix: change name file
DamienCode404 Nov 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions tools/metams/.shed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
definitions:
include: &default-includes
- test-data
- static
- lib.r
- macros.xml

name: metams
owner: workflow4metabolomics
remote_repository_url: https://github.com/workflow4metabolomics/tools-metabolomics/
homepage_url: http://workflow4metabolomics.org
categories:
- Metabolomics

repositories:
metams_plot:
description: '[Metabolomics][W4M][GC-MS] GC-MS plotting after data preprocessing using metaMS package'
long_description: |
Part of the W4M project : http://workflow4metabolomics.org Plotting of preprocessing data by metaMS.
owner: workflow4metabolomics
include:
[*default-includes, metams_plot.xml, metams_plot.r]
metams_run_gc:
description: '[Metabolomics][W4M][GC-MS] metaMS R Package - GC-MS data preprocessing using metaMS package'
long_description: |
Part of the W4M project: http://workflow4metabolomics.org
metaMS: https://www.bioconductor.org/packages/release/bioc/html/metaMS.html MS-based metabolomics data processing and compound annotation pipeline.
owner: yguitton
include:
[*default-includes, metams_run_gc.xml, metams_run_gc.r]

suite:
name: suite_metams
owner: workflow4metabolomics
homepage_url: http://workflow4metabolomics.org
description: '[Metabolomics][W4M][GC-MS] metaMS R package - GC-MS data preprocessing using metaMS package and plotting on these datas'
long_description: |
Part of the W4M project : http://workflow4metabolomics.org
metaMS: https://www.bioconductor.org/packages/release/bioc/html/metaMS.html MS-based metabolomics data processing, compound annotation pipeline and plotting.
124 changes: 124 additions & 0 deletions tools/metams/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
====================================
GC-MS data processing version 2.1.1
====================================

1) Date : 2019-05-20

2) Author and maintainer :

Yann GUITTON

LABERCA - PFCA Metabolomics Platform

E-mail: [email protected] / [email protected]

3) Funding :

Developed within IDEALG project (http://www.idealg.ueb.eu/versionAnglaise/)

Developed within IFB-MetaboHub W4M project

4) Usage restrictions :

Use of this tool is restricted to the service conditions of the MetaboHUB-IFB infrastructures.
For any question regarding the use of these services, please contact: [email protected]

5) Installation :

4 files are required for installation :

- 'README.rst'
Instructions for installation

- 'metaMS_plot.xml'
Configuration file; to be put into the './galaxy-dist/tools/' directory
and 2.png files for illustration

- 'metaMS_plot.r'
Wrapper code written in R aimed at launching the runGC function from the metaMS package given the arguments entered by the user through the Galaxy interface

- 'metaMS R package '
The 'metaMS' package requires dependencies and can be installed with source("http://bioconductor.org/biocLite.R") or `biocLite("metaMS")`

This code is for installation of the Galaxy module on the Workflow4metabolomics.org MetaboHUB-IFB platform only and must not be distributed without the author agreement


Changelog/News
--------------
**Version 1.0 - 20/05/2019**

- NEW : new tool extract from previous metaMS_runGC tool. EICs have been corrected.

Test Status
-----------

Planemo test using conda: passed


====================================
GC-MS data processing version 3.0.0
====================================

1) Date : 2019-05-20

2) Author and maintainer :

Yann GUITTON

LABERCA - PFCA Metabolomics Platform

E-mail: [email protected] / [email protected]

3) Funding :

Developed within IDEALG project (http://www.idealg.ueb.eu/versionAnglaise/)

Developed within IFB-MetaboHub W4M project

4) Usage restrictions :

Use of this tool is restricted to the service conditions of the MetaboHUB-IFB infrastructures.
For any question regarding the use of these services, please contact: [email protected]

5) Installation :

4 files are required for installation :

- 'README.rst'
Instructions for installation

- 'metaMS_runGC.xml'
Configuration file; to be put into the './galaxy-dist/tools/' directory
and 2.png files for illustration

- 'metaMS_runGC.r'
Wrapper code written in R aimed at launching the runGC function from the metaMS package given the arguments entered by the user through the Galaxy interface

- 'metaMS R package '
The 'metaMS' package requires dependencies and can be installed with source("http://bioconductor.org/biocLite.R") or `biocLite("metaMS")`

This code is for installation of the Galaxy module on the Workflow4metabolomics.org MetaboHUB-IFB platform only and must not be distributed without the author agreement


Changelog/News
--------------
**Version 3.0 - 20/05/2019**

- Divided tool into two new. One will be metaMS_plot and this one stay the same without plotting chromatograms and without zip files

**Version 2.0 - 15/05/2017**

- RI option, better usage of ri filter and easier file reading for RI database

**Version 1.1 - 11/07/2016**

- TEST: refactoring to pass planemo test using conda dependencies

**Version 1.0 - 01/06/2015**

- NEW: new tool

Test Status
-----------

Planemo test using conda: passed
Loading
Loading