Re-re-visit how Galaxy modules are imported. #56
Merged
Conversation
This file contains 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
Hack planemo's sys.path instead of essentially hacking externally so that Planemo's variant of galaxy modules can never affect external Galaxy calls.
... no longer needed because Planemo's PYTHONPATH doesn't need to conflict with Galaxy's - planemo adds the proper modules at runtime not prior to execution.
1) Make implicit dependency on virtualenv optional. 2) Don't run common_startup.sh - this is done inside of run_tests.sh now.
jmchilton
added a commit
that referenced
this pull request
Jan 13, 2015
Re-re-visit how Galaxy modules are imported.
jmchilton
added a commit
that referenced
this pull request
Jan 13, 2015
... I believe this is no longer a problem after pull request #56.
This was referenced Jan 13, 2015
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Should prevent Galaxy from failing to load if planemo's virtual environment is not deactivated. Eliminates some of the terrible hacks related to de-activating planemo's virutalenv before starting Galaxy (though admittedly introduces its own terrible hack of planemo's runtime sys.path in the CLI load point).
Should close #50 and #55 and is a better response to #47.