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

Update tool XSD for (hopefully deprecated) change_format syntax. #3579

Merged
merged 1 commit into from Feb 13, 2017

Conversation

Projects
None yet
3 participants
@jmchilton
Copy link
Member

commented Feb 8, 2017

Fixes #3552.

<xs:annotation>
<xs:documentation xml:lang="en">This value must be the attribute name of
<xs:documentation xml:lang="en">This attribute should be the name of
the desired input parameter (e.g. ``input="out_format"`` above).</xs:documentation>

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Feb 8, 2017

Member

I think the documentation of value below is not correct, it says: This value must also be an attribute name of an input parameter (e.g. ``value="interval"`` above)., but should be: This must be a possible value of the ``input`` parameter (e.g. ``value="interval"`` above), or of the ``input_dataset``'s ``attribute.

@martenson

This comment has been minimized.

Copy link
Member

commented Feb 8, 2017

test/functional/tools/output_format.xml
not ok 85 test/functional/tools/output_format.xml
    Warning: program compiled against libxml 208 using older 207
    -:22: element when: Schemas validity error : Element 'when': The attribute 'attribute' is required but missing.
    -:22: element when: Schemas validity error : Element 'when': The attribute 'input_dataset' is required but missing.
    -:23: element when: Schemas validity error : Element 'when': The attribute 'attribute' is required but missing.
    -:23: element when: Schemas validity error : Element 'when': The attribute 'input_dataset' is required but missing.
    - fails to validate
@nsoranzo

This comment has been minimized.

Copy link
Member

commented Feb 8, 2017

The validate-test-tools build fail is legit, use="required" must be removed from attribute and input_dataset .

Also I think I'd like to have their definition order swapped, first input_dataset then attribute.

@jmchilton jmchilton force-pushed the jmchilton:deprecated_change_format_when branch from 46add27 to 7e98cde Feb 8, 2017

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Feb 13, 2017

I believe I have addressed the relevant issues and this is ready to go.

@nsoranzo nsoranzo merged commit b4b75b2 into galaxyproject:dev Feb 13, 2017

5 checks passed

api test Build finished. 263 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 140 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 24 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.