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

merge 15.05 into dev #240

Merged
merged 20 commits into from
May 7, 2015
Merged

merge 15.05 into dev #240

merged 20 commits into from
May 7, 2015

Commits on May 1, 2015

  1. Configuration menu
    Copy the full SHA
    9cdd688 View commit details
    Browse the repository at this point in the history
  2. Merge pull request galaxyproject#201 from bgruening/couple_image_to_ie

    [Stable] Bind the IPython IE to a fixed Docker Image
    jmchilton committed May 1, 2015
    Configuration menu
    Copy the full SHA
    a319329 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2015

  1. Fix job files API for case when nginx upload not being used.

    Fixes regressions introduced with PR galaxyproject#110.
    jmchilton committed May 5, 2015
    Configuration menu
    Copy the full SHA
    a594b32 View commit details
    Browse the repository at this point in the history
  2. Merge pull request galaxyproject#213 from jmchilton/job_files_fix

    [STABLE] Job file API fixes
    dannon committed May 5, 2015
    Configuration menu
    Copy the full SHA
    d523d53 View commit details
    Browse the repository at this point in the history
  3. 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)
    dannon committed May 5, 2015
    Configuration menu
    Copy the full SHA
    c1c8259 View commit details
    Browse the repository at this point in the history
  4. 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...
    jmchilton committed May 5, 2015
    Configuration menu
    Copy the full SHA
    5cf0332 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2015

  1. 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.
    jmchilton committed May 6, 2015
    Configuration menu
    Copy the full SHA
    5f91d90 View commit details
    Browse the repository at this point in the history
  2. Bugfix: Make dataset naming more deterministic.

    Found bug with tox randomizing Python's hash seed.
    jmchilton committed May 6, 2015
    Configuration menu
    Copy the full SHA
    5711b45 View commit details
    Browse the repository at this point in the history
  3. Fix some doctests that were assuming fixed Python hashing.

    Tests are more correct and perhaps less strong as result.
    jmchilton committed May 6, 2015
    Configuration menu
    Copy the full SHA
    5ddc493 View commit details
    Browse the repository at this point in the history
  4. Exclude some more non-Galaxy code from unit tests.

    These functions were imported from an external module and contain non-deterministic doctests.
    jmchilton committed May 6, 2015
    Configuration menu
    Copy the full SHA
    32eb76e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4991084 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a15a2bd View commit details
    Browse the repository at this point in the history
  7. 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.
    jmchilton committed May 6, 2015
    Configuration menu
    Copy the full SHA
    bc48ac1 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2015

  1. History UI: in published/annotated panels, fix metafile download drop…

    …downs (BAM files, etc.) to open properly, remove console statement in template
    carlfeberhard committed May 7, 2015
    Configuration menu
    Copy the full SHA
    c2d52fd View commit details
    Browse the repository at this point in the history
  2. Merge pull request galaxyproject#234 from carlfeberhard/fix.metadownl…

    …oad-btn
    
    [STABLE] History UI: in published/annotated panels, fix metafile download drop…
    dannon committed May 7, 2015
    Configuration menu
    Copy the full SHA
    ac9b46c View commit details
    Browse the repository at this point in the history
  3. Merge pull request galaxyproject#222 from jmchilton/tox_switch_and_fixes

    [15.05] Switch Travis testing to tox and associated fixes.
    dannon committed May 7, 2015
    Configuration menu
    Copy the full SHA
    7a936f8 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'upstream/release_15.03' into release_15.05

    Conflicts:
    	config/plugins/interactive_environments/ipython/config/ipython.ini.sample
    natefoo committed May 7, 2015
    Configuration menu
    Copy the full SHA
    049e9e8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3d58673 View commit details
    Browse the repository at this point in the history
  6. Merge pull request galaxyproject#238 from martenson/gitignore-tox

    [15.05] add .tox folder to gitignore
    jmchilton committed May 7, 2015
    Configuration menu
    Copy the full SHA
    0964464 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'release_15.05' into dev

    Conflicts:
    	config/plugins/visualizations/common/templates/script_entry_point.mako
    martenson committed May 7, 2015
    Configuration menu
    Copy the full SHA
    d28ea45 View commit details
    Browse the repository at this point in the history