-
Notifications
You must be signed in to change notification settings - Fork 966
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
merge 15.05 into dev #240
merge 15.05 into dev #240
Commits on May 1, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 9cdd688 - Browse repository at this point
Copy the full SHA 9cdd688View commit details -
Merge pull request galaxyproject#201 from bgruening/couple_image_to_ie
[Stable] Bind the IPython IE to a fixed Docker Image
Configuration menu - View commit details
-
Copy full SHA for a319329 - Browse repository at this point
Copy the full SHA a319329View commit details
Commits on May 5, 2015
-
Fix job files API for case when nginx upload not being used.
Fixes regressions introduced with PR galaxyproject#110.
Configuration menu - View commit details
-
Copy full SHA for a594b32 - Browse repository at this point
Copy the full SHA a594b32View commit details -
Merge pull request galaxyproject#213 from jmchilton/job_files_fix
[STABLE] Job file API fixes
Configuration menu - View commit details
-
Copy full SHA for d523d53 - Browse repository at this point
Copy the full SHA d523d53View commit details -
Check to see if toolshed install is actually bound prior to disposing…
… (exact same functionality here, but it's less chatty this way, since it might not be bound)
Configuration menu - View commit details
-
Copy full SHA for c1c8259 - Browse repository at this point
Copy the full SHA c1c8259View commit details -
Merge pull request galaxyproject#215 from dannon/release_15.03
[15.03] Check to see if toolshed install is actually bound prior to disposing (e...
Configuration menu - View commit details
-
Copy full SHA for 5cf0332 - Browse repository at this point
Copy the full SHA 5cf0332View commit details
Commits on May 6, 2015
-
Move toward tox testing for TravisCI.
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.
Configuration menu - View commit details
-
Copy full SHA for 5f91d90 - Browse repository at this point
Copy the full SHA 5f91d90View commit details -
Bugfix: Make dataset naming more deterministic.
Found bug with tox randomizing Python's hash seed.
Configuration menu - View commit details
-
Copy full SHA for 5711b45 - Browse repository at this point
Copy the full SHA 5711b45View commit details -
Fix some doctests that were assuming fixed Python hashing.
Tests are more correct and perhaps less strong as result.
Configuration menu - View commit details
-
Copy full SHA for 5ddc493 - Browse repository at this point
Copy the full SHA 5ddc493View commit details -
Exclude some more non-Galaxy code from unit tests.
These functions were imported from an external module and contain non-deterministic doctests.
Configuration menu - View commit details
-
Copy full SHA for 32eb76e - Browse repository at this point
Copy the full SHA 32eb76eView commit details -
Attempt to fix manager, viz, and web unit tests for Python 2.6...
... using unittest2.
Configuration menu - View commit details
-
Copy full SHA for 4991084 - Browse repository at this point
Copy the full SHA 4991084View commit details -
Configuration menu - View commit details
-
Copy full SHA for a15a2bd - Browse repository at this point
Copy the full SHA a15a2bdView commit details -
Update tool tests to reflect get_tool is non-deterministic...
... if supplied a short id instead of a GUID and there are multiple versions of a shed tool with the same short id installed.
Configuration menu - View commit details
-
Copy full SHA for bc48ac1 - Browse repository at this point
Copy the full SHA bc48ac1View commit details
Commits on May 7, 2015
-
History UI: in published/annotated panels, fix metafile download drop…
…downs (BAM files, etc.) to open properly, remove console statement in template
Configuration menu - View commit details
-
Copy full SHA for c2d52fd - Browse repository at this point
Copy the full SHA c2d52fdView commit details -
Merge pull request galaxyproject#234 from carlfeberhard/fix.metadownl…
…oad-btn [STABLE] History UI: in published/annotated panels, fix metafile download drop…
Configuration menu - View commit details
-
Copy full SHA for ac9b46c - Browse repository at this point
Copy the full SHA ac9b46cView commit details -
Merge pull request galaxyproject#222 from jmchilton/tox_switch_and_fixes
[15.05] Switch Travis testing to tox and associated fixes.
Configuration menu - View commit details
-
Copy full SHA for 7a936f8 - Browse repository at this point
Copy the full SHA 7a936f8View commit details -
Merge remote-tracking branch 'upstream/release_15.03' into release_15.05
Conflicts: config/plugins/interactive_environments/ipython/config/ipython.ini.sample
Configuration menu - View commit details
-
Copy full SHA for 049e9e8 - Browse repository at this point
Copy the full SHA 049e9e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3d58673 - Browse repository at this point
Copy the full SHA 3d58673View commit details -
Merge pull request galaxyproject#238 from martenson/gitignore-tox
[15.05] add .tox folder to gitignore
Configuration menu - View commit details
-
Copy full SHA for 0964464 - Browse repository at this point
Copy the full SHA 0964464View commit details -
Merge branch 'release_15.05' into dev
Conflicts: config/plugins/visualizations/common/templates/script_entry_point.mako
Configuration menu - View commit details
-
Copy full SHA for d28ea45 - Browse repository at this point
Copy the full SHA d28ea45View commit details