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

Make bwa data_collection example consistent. #256

Merged
merged 1 commit into from Jul 7, 2015

Conversation

Projects
None yet
3 participants
@peterjc
Copy link
Contributor

peterjc commented Jul 6, 2015

The XML examples were missing collection_type=paired (spotted by @jmchilton during the GCC2015 training day) while the RST file was missing the help attribute.

@peterjc

This comment has been minimized.

Copy link
Contributor Author

peterjc commented Jul 6, 2015

See also #253 #254 and #255 which cover the first half of this PR (duplicated effort with @blankenberg - whoops)

Make bwa data_collection example consistent.
The XML examples were missing collection_type=paired (spotted by
@jmchilton during the GCC2015 training day) while the RST file
was missing the help attribute.

@peterjc peterjc force-pushed the peterjc:bwa_paired_col_eg branch from cc13a5b to f0c4e35 Jul 6, 2015

@peterjc

This comment has been minimized.

Copy link
Contributor Author

peterjc commented Jul 6, 2015

Rebased after #253 #254 and #255 were merged.

jmchilton added a commit that referenced this pull request Jul 7, 2015

Merge pull request #256 from peterjc/bwa_paired_col_eg
Make bwa data_collection example consistent.

@jmchilton jmchilton merged commit 51f132e into galaxyproject:master Jul 7, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jmchilton

This comment has been minimized.

Copy link
Member

jmchilton commented Jul 7, 2015

Thanks for the fix!

@@ -38,7 +38,7 @@
<param name="fastq_input1" type="data" format="fastqsanger" label="Select fastq dataset" help="Specify dataset with single reads"/>
</when>
<when value="paired_collection">
<param name="fastq_input" format="fastqsanger" type="data_collection" collection_type="paired" label="Select dataset pair" help="Specify paired dataset collection containing paired reads" />
<param name="fastq_input" format="fastqsanger" type="data_collection" collection_type="paired" label="Select a paired collection" label="Select dataset pair" help="Specify paired dataset collection containing paired reads"/>

This comment has been minimized.

@nsoranzo

nsoranzo Jul 9, 2015

Member

There are 2 labels here now!

This comment has been minimized.

@peterjc

peterjc Jul 12, 2015

Author Contributor

Looks like I screwed up the rebase; shouldn't have tried this will half listening to a talk.

This comment has been minimized.

@peterjc

peterjc Aug 4, 2015

Author Contributor

Double label was fixed in a9d71d2

@@ -42,7 +42,7 @@
<param name="fastq_input1" type="data" format="fastqsanger" label="Select fastq dataset" help="Specify dataset with single reads"/>
</when>
<when value="paired_collection">
<param name="fastq_input" format="fastqsanger" type="data_collection" collection_type="paired" label="Select dataset pair" help="Specify paired dataset collection containing paired reads" />
<param name="fastq_input" format="fastqsanger" type="data_collection" collection_type="paired" label="Select a paired collection" label="Select dataset pair" help="Specify paired dataset collection containing paired reads"/>

This comment has been minimized.

@nsoranzo

nsoranzo Jul 9, 2015

Member

Same as above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment