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

object output from PAGA plotting #226

Merged
merged 28 commits into from
Apr 12, 2021
Merged

Conversation

pinin4fjords
Copy link
Member

@pinin4fjords pinin4fjords commented Apr 8, 2021

Description

This is the Galaxy component of ebi-gene-expression-group/scanpy-scripts#95. Essentially configuring the PAGA plotting to output an object alongside the plotfile, which can then be used for initialising FDG.

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist

  • I have made any required changes to upstream dependencies for a tool wrapper, and they are available in distribution channels (e.g. Pip, Conda).
  • If I have updated the underlying software for a tool wrapper (e.g. scanpy-scripts by changing the value of @TOOL_VERSION@), then I have reset all 'build' values to 0 (e.g. @TOOL_VERSION@+galaxy0)
  • If I have updated a tool wrapper without a software change, then I have bumped the associated 'build' values (e.g. @TOOL_VERSION@+galaxy0 @TOOL_VERSION@+galaxy1)

@pinin4fjords pinin4fjords changed the title Feature/fdg paga init [WIP] object output from PAGA plotting Apr 8, 2021
@pcm32
Copy link
Member

pcm32 commented Apr 8, 2021

Could we smuggle here the change of the last citation to our nature methods?

<citation type="doi">10.1101/2020.04.08.032698</citation>

I tried committing it myself, but for some reason it doesn't allow me to write to it ¿?.

@pinin4fjords
Copy link
Member Author

We appear to be suffering from issues like those reported in galaxyproject/planemo#1078. Trying to think of a way of working around them here.

@pinin4fjords
Copy link
Member Author

I think the MNN issues preventing the CI passing are down to a numpy problem- I've tried to apply a fix in a new build of scanpy scripts bioconda/bioconda-recipes#27908

@pinin4fjords
Copy link
Member Author

Okay, we can't actually skip single tools yet (see galaxyproject/planemo-ci-action#13).

@pcm32 the test for MNN passes locally, and the trajectory plotting passes here (which is what this PR should be about). Can we override the CI and merge this for now, in the interests of getting this functionality out there? I don't have more time to spend on the MNN instruction error thing.

@pinin4fjords pinin4fjords changed the title [WIP] object output from PAGA plotting object output from PAGA plotting Apr 12, 2021
@pinin4fjords pinin4fjords requested a review from pcm32 April 12, 2021 09:42
Copy link
Member

@pcm32 pcm32 left a comment

Choose a reason for hiding this comment

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

LGTM, please bump the version to reflect the scanpy version as suggested.

tools/tertiary-analysis/scanpy/scanpy_macros2.xml Outdated Show resolved Hide resolved
echo "Unsuccessful tests found, inspect the 'All tool test results' artifact for details."
exit 1
fi

Copy link
Member

Choose a reason for hiding this comment

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

Just to make a note that the copy from FTP code is here.

@pinin4fjords
Copy link
Member Author

Okay, looking good now I think. I'll keep an eye and see if the deploy works, of if I'll have to update as I've done in pr.yaml.

@pinin4fjords pinin4fjords merged commit 858a239 into develop Apr 12, 2021
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.

2 participants