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

[18.01] Add support for the ideaspre datatype #5445

Merged
merged 2 commits into from Feb 8, 2018

Conversation

Projects
None yet
6 participants
@gregvonkuster
Contributor

gregvonkuster commented Feb 2, 2018

@martenson this looks messy to me, but I'm not a cherry-pick expert, so I hope this is ok. Please let me know. Thanks a bunch for the help on this!

@martenson

This comment has been minimized.

Member

martenson commented Feb 2, 2018

Yeah, this does not look right. And it is targeting dev again.

@mvdbeek mvdbeek changed the base branch from dev to release_18.01 Feb 2, 2018

@mvdbeek

This comment has been minimized.

Member

mvdbeek commented Feb 2, 2018

Targeting dev was the problem, the rest is OK

@gregvonkuster

This comment has been minimized.

Contributor

gregvonkuster commented Feb 2, 2018

Ah, thanks to both of you!

@@ -518,6 +518,73 @@ class Snptest(Rgenetics):
file_ext = "snptest"
class IdeasPre(Rgenetics):

This comment has been minimized.

@nsoranzo

nsoranzo Feb 2, 2018

Member

You can probably use Html here instead of Rgenetics

This comment has been minimized.

This comment has been minimized.

@nsoranzo

nsoranzo Feb 2, 2018

Member

Why would that be the case?

This comment has been minimized.

@gregvonkuster

gregvonkuster Feb 2, 2018

Contributor

@nsoranzo The main reason is that the Galaxy upload tool will not allow uploading the Html datatype - https://github.com/galaxyproject/galaxy/blob/dev/tools/data_source/upload.py#L277. But tool functional tests require the use of the upload tool. I suppose this class could subclass the Html datatype like the Rgenetics datatype does though. Is this needed?

This comment has been minimized.

@nsoranzo

nsoranzo Feb 2, 2018

Member

@gregvonkuster That was my point, subclassing Rgenetics and overload all its method is equivalent to subclass Html. But I see you changed it already, thanks!

@gregvonkuster

This comment has been minimized.

Contributor

gregvonkuster commented Feb 5, 2018

Ping @davebx and @martenson is this ready for merging?

@martenson martenson changed the title from Add support for the ideaspre datatype targeting 18.01 to [18.01] Add support for the ideaspre datatype Feb 5, 2018

@martenson martenson added this to the 18.01 milestone Feb 5, 2018

@gregvonkuster

This comment has been minimized.

Contributor

gregvonkuster commented Feb 8, 2018

Ping @davebx and @martenson can this be merged?

@davebx davebx merged commit 3f50b45 into galaxyproject:release_18.01 Feb 8, 2018

6 checks passed

api test Build finished. 344 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 171 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 79 tests run, 4 skipped, 0 failed.
Details
selenium test Build finished. 118 tests run, 2 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
@davebx

This comment has been minimized.

Contributor

davebx commented Feb 8, 2018

@gregvonkuster yes it can.

@gregvonkuster

This comment has been minimized.

Contributor

gregvonkuster commented Feb 8, 2018

Thanks a bunch @davebx ;)

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