Skip to content

Merge nmr_bucketing #140

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 83 commits into from
Closed

Merge nmr_bucketing #140

wants to merge 83 commits into from

Conversation

lecorguille
Copy link
Member

lecorguille and others added 30 commits April 7, 2016 22:38
@lecorguille
first commit
d9e746c
@lecorguille
add a test data
4701da3
@lecorguille
planemo tes using conda passed
d0ec6a9
@lecorguille
README
ab39865
@lecorguille
add tool_dep for pracma
4277be9
@lecorguille
Merge pull request #1 from workflow4metabolomics/test
93a6ff8 
Test
@lecorguille
add .shed.yml
ca7fbe2
@lecorguille
add planemo test results ; change version ; add README.md
8eafcbf
@lecorguille
planemo shed_test passed
44fd4fc
@lecorguille
add travis test
3e3d91f
@lecorguille
Update README.md
97481fa
@lecorguille
add info about conda
1933f06
@lecorguille
Merge branch 'master' of github.com:workflow4metabolomics/nmr_bucketing
9e3e028
@yguitton
small edit remove IPO mention in Conda
d448414
@mtremblayfr
x-axis customization: add chemical shift labels
5da515b
@mtremblayfr
Merge branch 'dev'
76aa262
@lecorguille
change output order to propose bucketedData to normalization by default
df8740e
@pkrog
Add Metabolomics tag in Galaxy toolshed descriptions.
460043d
@lecorguille
Update .travis.yml
3f109aa 
galaxyproject/planemo#520
@lecorguille
change output order to propose bucketedData to normalization by default
247d877
@pkrog @lecorguille
Add Metabolomics tag in Galaxy toolshed descriptions.
e8def1b
@lecorguille
Update .travis.yml
32fa2b6 
galaxyproject/planemo#520
@lecorguille
fix a bug on an object name
f881d04
@lecorguille
minor
2fc8ef2
@lecorguille
remove the galaxy dev branch settings
34f4015
@lecorguille
Merge pull request #3 from workflow4metabolomics/dev_marie_gildas
1c72704 
fix a bug on an object name
@lecorguille
Merge pull request #4 from workflow4metabolomics/dev_marie
7cd224b 
x-axis customization: add chemical shift labels
@mtremblayfr
Change of file input type to allow bucketing of preprocessed files
08fb157
@mtremblayfr
Bucketing depends on file type: if Bruker, read of raw files; if tsv,…
975522d 
… direct bucketing
@mtremblayfr
Change of x-axis label
03dfc60
lecorguille and others added 23 commits March 17, 2020 11:21
@lecorguille
nmr_bucketing - NmrBucketing - add zip datatype
fb9f570
@lecorguille
Merge branch 'master' into nmr_bucketing
9f9a621
@lecorguille
Merge branch 'master' into nmr_bucketing
443f211
@lecorguille
Merge branch 'master' into nmr_bucketing
b420aa1
@lecorguille
Merge branch 'master' into nmr_bucketing
a1d2d3b
@lecorguille
Minor text modification following #111
83441ad
@lecorguille
Minor fix regarding plot colors following #111
2711609
@lecorguille
Changelog for group plot fix
6c44743
@lecorguille
Add the possibility to get a tabular file in findChromPeak following #…
9fd0869 
…111
@lecorguille
Typo #111
2193dec
@lecorguille
Tool version updates
554a497
@lecorguille
Indentation issues
e5f73f3
@sgsokol @lecorguille
added influx_si tool
9766809
@sgsokol @lecorguille
v0.9.0
f874eae 
 - rewritten boolean options;
 - rewritten label tags;
 - removed --fseries and --prof;
 - removed help string as doubling inline help strings;
 - replaced ';' by '&&' in command line;
 - renamed owner to workflow4metabolomics;
 - fixed indentation in test section;
@sgsokol @lecorguille
v.0.9.1
6fcee80 
 - removed macro.xml
 - updated --meth=METH

Signed-off-by: Serguei Sokol <[email protected]>
@sgsokol @lecorguille
- fixed tool version
89969ad 
- fixed --meth sending 'None'
- fixed file renaming when influx_si aborts
@sgsokol @lecorguille
fixed return code for normal case
1f3c9de
@lecorguille
xcms_summary - upgrade CAMERA
9760450
@lecorguille
# travis_wait 30
b08241d
@lecorguille
xcms-summary - fix test
e04f4e2
@lecorguille
Merge branch 'nmr_bucketing' of github.com:workflow4metabolomics/tool…
bada945 
…s-metabolomics into nmr_bucketing
@lecorguille
Merge branch 'master' into nmr_bucketing
63a4649
@bgruening @lecorguille
update travis
034b3f4
@lecorguille
Copy link
Member Author

Please mv to this PR #187
I tried to cleanup a little the mess in the commits

@lecorguille lecorguille deleted the nmr_bucketing branch November 27, 2020 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@lecorguille @yguitton @mtremblayfr @pkrog @sgsokol @bgruening