Merge changes to common modules shared between Galaxy, Planemo, and Pulsar.#1005
Merged
jmchilton merged 10 commits intogalaxyproject:devfrom Nov 2, 2015
Merged
Conversation
hanging an inline violates E113 (although PEP-8 does not explicitly say it's not allowed, but it does say "An inline comment is a comment on the same line as a statement"), so convert the comments to block.
Member
|
LGTM
I think this is a Planemo bug introduced in galaxyproject/planemo@912df02 . |
Member
|
natefoo#1 to touch up invalid linting code that got left in planemo somehow and removed today. |
Member
Remove old XSD linting code.
Member
Author
|
natefoo#1 is merged. You could have just committed directly to my fork. ;P |
Member
|
Thought I tried to be honest. Anyway thanks for taking care of this. |
jmchilton
added a commit
that referenced
this pull request
Nov 2, 2015
Merge changes to common modules shared between Galaxy, Planemo, and Pulsar.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Corresponding updates to Pulsar and Planemo in galaxyproject/pulsar#85 and galaxyproject/planemo#356
This is going to fail unit tests because
galaxy.tools.linters.xsdattempts tofrom ..lint import SkipLint, butgalaxy.tools.linthas noSkipLint. Any idea what that's supposed to be, @jmchilton?Two things worth noting:
galaxy.utiland Planemo'splanemo_ext.galaxy.util, I did not merge these changesIn the short term, we should try to do a better job of only updating these things in one place and then pushing them one direction. I propose:
$PULSAR/pulsar/clientis the canonical source for$GALAXY/lib/pulsar/client$GALAXY/lib/galaxy/jobs/runners/utilis the canonical source for$PULSAR/pulsar/managers/util$GALAXY/lib/galaxyis the canonical source for$PULSAR/galaxyand$PLANEMO/planemo_ext/galaxy(even the linting stuff that originated in Planemo)In the long term, when Galaxy is a lib (#921), we should not maintain local copies of Galaxy things in either Planemo or Pulsar.