[galaxy-commits] [galaxyproject/galaxy] 4f3c44: Move the registration of the start function into t...

GitHub noreply at github.com
Wed Sep 7 11:18:24 EDT 2016


  Branch: refs/heads/master
  Home:   https://github.com/galaxyproject/galaxy
  Commit: 4f3c44f3ad386a667f156f39d1af44bf23b7a8ab
      https://github.com/galaxyproject/galaxy/commit/4f3c44f3ad386a667f156f39d1af44bf23b7a8ab
  Author: Nate Coraor <nate at bx.psu.edu>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M lib/galaxy/tools/toolbox/base.py
    M lib/galaxy/tools/toolbox/watcher.py

  Log Message:
  -----------
  Move the registration of the start function into the ToolConfWatcher
itself so it doesn't have to be called by things that instantiate it.
Fixes #2831.


  Commit: 6631367b7cd4f2049426f3554eef6da626b83837
      https://github.com/galaxyproject/galaxy/commit/6631367b7cd4f2049426f3554eef6da626b83837
  Author: Dannon Baker <dannon.baker at gmail.com>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M lib/galaxy/tools/toolbox/base.py

  Log Message:
  -----------
  Unused import, cleanup for #2856


  Commit: 3e65a165b722740b48ece5dab36a2a28cfa7681c
      https://github.com/galaxyproject/galaxy/commit/3e65a165b722740b48ece5dab36a2a28cfa7681c
  Author: Martin Cech <cech.marten at gmail.com>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M doc/source/releases/16.07.rst

  Log Message:
  -----------
  fix inclusion of release notes in announcement


  Commit: c98331eddd3f8a57cedca313249798e1e45a9555
      https://github.com/galaxyproject/galaxy/commit/c98331eddd3f8a57cedca313249798e1e45a9555
  Author: Martin Cech <cech.marten at gmail.com>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M lib/galaxy/tools/toolbox/base.py
    M lib/galaxy/tools/toolbox/watcher.py

  Log Message:
  -----------
  Merge pull request #2856 from natefoo/postfork-tool-conf-watcher-test-fix

[16.07] Postfork tool conf watcher test fix


  Commit: 53a5b76ff2e47bbf821845e0d2170240902a70eb
      https://github.com/galaxyproject/galaxy/commit/53a5b76ff2e47bbf821845e0d2170240902a70eb
  Author: Martin Cech <cech.marten at gmail.com>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M lib/galaxy/tools/toolbox/base.py

  Log Message:
  -----------
  Merge pull request #2860 from dannon/postfork-tool-conf-watcher-test-fix

[16.07] Unused import cleanup for #2856


  Commit: e891c5755f59e8865cbee56cd4fcc8e5f4bbd0af
      https://github.com/galaxyproject/galaxy/commit/e891c5755f59e8865cbee56cd4fcc8e5f4bbd0af
  Author: Dannon Baker <dannon.baker at gmail.com>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M doc/source/releases/16.07.rst

  Log Message:
  -----------
  Merge pull request #2859 from martenson/fix-notes-include

[16.07] fix inclusion of release notes in the announcement


  Commit: d1821fed475a4261c007de3627cb3eeb42d53a1f
      https://github.com/galaxyproject/galaxy/commit/d1821fed475a4261c007de3627cb3eeb42d53a1f
  Author: Martin Cech <cech.marten at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M config/galaxy.ini.sample
    M lib/galaxy/tools/deps/__init__.py

  Log Message:
  -----------
  disable conda_auto_init


  Commit: 52768c0c42313c08f25ba07b47ccf2bed28248f4
      https://github.com/galaxyproject/galaxy/commit/52768c0c42313c08f25ba07b47ccf2bed28248f4
  Author: Dannon Baker <dannon.baker at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M config/galaxy.ini.sample
    M lib/galaxy/tools/deps/__init__.py

  Log Message:
  -----------
  Merge pull request #2863 from martenson/release_16.07

[16.07] backport disable conda_auto_init


  Commit: 6724146e7d09e5c0ac4f19d96e600d14831a8abe
      https://github.com/galaxyproject/galaxy/commit/6724146e7d09e5c0ac4f19d96e600d14831a8abe
  Author: John Chilton <jmchilton at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M lib/galaxy/tools/deps/resolvers/conda.py

  Log Message:
  -----------
  Fix three conda bugs.

- Don't attempt file lock if don't have write access for lock.
- Set disabled to False if conda present and auto_init is False.
- Use the correct parent path for conda_prefix (if default parent path is overridden).


  Commit: c01ce21e2cdb7b229dd8ced14e4e2c1c7fdf294c
      https://github.com/galaxyproject/galaxy/commit/c01ce21e2cdb7b229dd8ced14e4e2c1c7fdf294c
  Author: Martin Cech <cech.marten at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M lib/galaxy/tools/deps/resolvers/conda.py

  Log Message:
  -----------
  Merge pull request #2864 from jmchilton/conda_fixes

[16.07] Fix three conda bugs.


  Commit: e320b1aaa70aea38b7108ca6ae372b1d06fd30bc
      https://github.com/galaxyproject/galaxy/commit/e320b1aaa70aea38b7108ca6ae372b1d06fd30bc
  Author: Dannon Baker <dannon.baker at gmail.com>
  Date:   2016-09-07 (Wed, 07 Sep 2016)

  Changed paths:
    M config/galaxy.ini.sample
    M doc/source/releases/16.07.rst
    M lib/galaxy/tools/deps/__init__.py
    M lib/galaxy/tools/deps/resolvers/conda.py
    M lib/galaxy/tools/toolbox/base.py
    M lib/galaxy/tools/toolbox/watcher.py

  Log Message:
  -----------
  Merge branch 'release_16.07'


Compare: https://github.com/galaxyproject/galaxy/compare/ddc9c647b2d2...e320b1aaa70a


More information about the galaxy-commits mailing list