merge 15.05 into dev #240
Merged
merge 15.05 into dev #240
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
[Stable] Bind the IPython IE to a fixed Docker Image
Fixes regressions introduced with PR galaxyproject#110.
[STABLE] Job file API fixes
… (exact same functionality here, but it's less chatty this way, since it might not be bound)
[15.03] Check to see if toolshed install is actually bound prior to disposing (e...
This is used by Bioblend, Pulsar, and Planemo and provides several benefits: - More flexibility then baking logic directly into .travis.yml - Makes the CI testing more portable - Generally leads to more parallelism on Travis - "prettier" display of results (things are broken down by the kind of test). For the last two points - compare https://travis-ci.org/galaxyproject/galaxy and https://travis-ci.org/galaxyproject/planemo. I would like to add the qunit tests to Travis and I see this a good first step toward being able to do that well.
Found bug with tox randomizing Python's hash seed.
Tests are more correct and perhaps less strong as result.
These functions were imported from an external module and contain non-deterministic doctests.
... using unittest2.
... if supplied a short id instead of a GUID and there are multiple versions of a shed tool with the same short id installed.
…downs (BAM files, etc.) to open properly, remove console statement in template
…oad-btn [STABLE] History UI: in published/annotated panels, fix metafile download drop…
[15.05] Switch Travis testing to tox and associated fixes.
Conflicts: config/plugins/interactive_environments/ipython/config/ipython.ini.sample
[15.05] add .tox folder to gitignore
Conflicts: config/plugins/visualizations/common/templates/script_entry_point.mako
|
👍 - The four Python 2.6 problems on Travis are a known issue and @carlfeberhard is going to PR a fix. |
|
thanks @jmchilton |
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.
one conflict resolved in script_entry_point.mako