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

Linting fixes #64

Merged
merged 6 commits into from Jul 15, 2021
Merged

Linting fixes #64

merged 6 commits into from Jul 15, 2021

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Jul 9, 2021

Fixes a bunch of things in #61

@mvdbeek mvdbeek force-pushed the linting_fixes branch 2 times, most recently from 4fe9d3e to 1403849 Compare July 9, 2021 14:47
These are the only fields allowed in the schema and should be sufficient
to restore the position.
schema/v19_09/workflow.yml Outdated Show resolved Hide resolved
schema/v19_09/workflow.yml Outdated Show resolved Hide resolved
@@ -56,6 +59,9 @@ def from_galaxy_native(native_workflow_dict, tool_interface=None, json_wrapper=F

# For each step, rebuild the form and encode the state
for step in native_steps.values():
position = prune_position(step)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having feature parity between .ga and Format 2 as the goal, can we confidently drop the other position fields (bottom, height, right, width, x, y) that .ga files contain for subworkflows?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did I miss a spot for subworkflows, or is the question if it's safe to drop the the remaining position elements ? Or that we should drop them from editor export altogether ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did I miss a spot for subworkflows

It seems that .ga files have the extra position fields only for subworkflows, not tools or inputs.

or is the question if it's safe to drop the the remaining position elements ? Or that we should drop them from editor export altogether?

My question is if these fields (bottom, height, right, width, x, y) are used by Galaxy, so if we drop them when converting to Format 2 here we are losing information (and so feature parity between the 2 formats).

Copy link
Member Author

@mvdbeek mvdbeek Jul 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that .ga files have the extra position fields only for subworkflows, not tools or inputs.

I haven't seen this, the position field should be independent of the step type.

My question is if these fields (bottom, height, right, width, x, y) are used by Galaxy, so if we drop them when converting to Format 2 here we are losing information (and so feature parity between the 2 formats).

Re-upload of a round-tripped workflow maintains the coordinates, but I've asked @jmchilton and @guerler for confirmation.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't seen this, the position field should be independent of the step type.

https://github.com/galaxyproject/SARS-CoV-2/blob/master/genomics/deploy/workflows/Genomics-4-All-in-one-subworkflow.ga has a mix of both styles, but it doesn't seem to depend on whether it's subworkflow or not. It might have to do on which version of Galaxy the workflow was defined ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@guerler confirmed that we only need left and top. I think that we store the the other values is probably a bug on the Galaxy side.

Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
Copy link
Member

@nsoranzo nsoranzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for investigating! Please merge (I don't have rights).

@jmchilton
Copy link
Member

I think that we store the the other values is probably a bug on the Galaxy side.

I mean we put other data we don't reuse in the file.

@nsoranzo nsoranzo merged commit 395bbee into galaxyproject:master Jul 15, 2021
@mvdbeek mvdbeek mentioned this pull request Sep 1, 2021
28 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants