- galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] ca5f60: Fix tool action redirects for non-default tools di...
by GitHub 21 Apr '16

21 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: ca5f6053c7b13fa8f631f0a96f78a8aac544175c https://github.com/galaxyproject/galaxy/commit/ca5f6053c7b13fa8f631f0a96f78… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-21 (Thu, 21 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form.js M lib/galaxy/tools/__init__.py M static/maps/mvc/tool/tool-form.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form.js Log Message: ----------- Fix tool action redirects for non-default tools displaying tool forms Commit: f70a2b024237dcc797665134e311e7ada7602b1c https://github.com/galaxyproject/galaxy/commit/f70a2b024237dcc797665134e311… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-21 (Thu, 21 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form.js M lib/galaxy/tools/__init__.py M static/maps/mvc/tool/tool-form.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form.js Log Message: ----------- Merge pull request #2211 from guerler/fix_nondefault_000 [16.04] Fix tool action redirect url for non-default tools Compare: https://github.com/galaxyproject/galaxy/compare/e88e615d6e6b...f70a2b024237

1 0

[galaxyproject/galaxy] 128a91: Checks for api_key before checking for header from...
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: 128a9112bb1635c1c49ac7dc1a99b531933ea659 https://github.com/galaxyproject/galaxy/commit/128a9112bb1635c1c49ac7dc1a99… Author: MatthewRalston <mrals89(a)gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Checks for api_key before checking for header from SSO. Also fixes the NoneType issue discovered in #972. Commit: 4e12c5e782249c3aea1ddbdd5bd2f363111e78b6 https://github.com/galaxyproject/galaxy/commit/4e12c5e782249c3aea1ddbdd5bd2… Author: MatthewRalston <mrals89(a)gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Fixes NoneType problem in a simpler way. Thanks @nsoranzo. Commit: 6473057f3b63ce615727800babbaf439ed66bb3f https://github.com/galaxyproject/galaxy/commit/6473057f3b63ce615727800babba… Author: Matt Ralston <mrals89(a)gmail.com> Date: 2016-02-26 (Fri, 26 Feb 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Adds whitespace Commit: 774487ddcc9c0e793b6b15b26c971c3df5822644 https://github.com/galaxyproject/galaxy/commit/774487ddcc9c0e793b6b15b26c97… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/mvc/citation/citation-model.js Log Message: ----------- Fix citation-model to fail silently/gracefully when a non-parsable bibtex entry is tried Commit: d225aebc8879b3e96963724d3b5b11aec1d50ed5 https://github.com/galaxyproject/galaxy/commit/d225aebc8879b3e96963724d3b5b… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/mvc/citation/citation-model.js Log Message: ----------- Merge pull request #1884 from carlfeberhard/release_15.10 [15.10] Fix citation-model to fail silently/gracefully Commit: e2a03646fd7c47a0ead962c9842e74f977dab8eb https://github.com/galaxyproject/galaxy/commit/e2a03646fd7c47a0ead962c9842e… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Fix farbtastic's use of deprecated jquery fns by loading jq-migrate in galaxy.panels.mako Commit: 9cff686d6d94a8d4a47c4c5cdc9d380fe686a8c4 https://github.com/galaxyproject/galaxy/commit/9cff686d6d94a8d4a47c4c5cdc9d… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge pull request #1972 from carlfeberhard/release_15.10 [15.10] Fix farbtastic's use of deprecated jquery fns by loading jq-migrate i… Commit: a2114fdd0e234a3253cec79a02e30899ca081359 https://github.com/galaxyproject/galaxy/commit/a2114fdd0e234a3253cec79a02e3… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Merge pull request #1801 from MatthewRalston/api_key_patch [15.10] Checks for api_key before checking for header from SSO. Commit: 449098d8b14b45269be106f6410c0b9145c51d50 https://github.com/galaxyproject/galaxy/commit/449098d8b14b45269be106f6410c… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-03-30 (Wed, 30 Mar 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- upgrade mercurial wheel to latest (fixing CVE issues) Commit: dc4d4cbce7b18b33ff09f722d58a551c6f024b7a https://github.com/galaxyproject/galaxy/commit/dc4d4cbce7b18b33ff09f722d58a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M config/tool_shed.ini.sample M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- disable 'hg push' to TS repositories deprecated in 15.10 https://docs.galaxyproject.org/en/master/releases/15.10_announce.html#depre… Commit: 7d08d1b0699a9e2adfa314af3e8324e257254ce0 https://github.com/galaxyproject/galaxy/commit/7d08d1b0699a9e2adfa314af3e83… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- Specify default value when getting disable_push Commit: a560ad8999eca1137aafa466ae07683ef9f6d9d3 https://github.com/galaxyproject/galaxy/commit/a560ad8999eca1137aafa466ae07… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: A test/tool_shed/functional/test_0310_hg_clone.py R test/tool_shed/functional/test_0310_hg_push_from_api.py Log Message: ----------- Update Tool Shed tests after disabling 'hg push' Commit: 28b5dd36832642b5ae519790c25fc2d15da11ca9 https://github.com/galaxyproject/galaxy/commit/28b5dd36832642b5ae519790c25f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M test/tool_shed/base/twilltestcase.py M test/tool_shed/functional/test_0310_hg_clone.py Log Message: ----------- add TS test for disabled hg push Commit: 0bcc7e37e1d94259c6b5c29ab7e8041e4228d05d https://github.com/galaxyproject/galaxy/commit/0bcc7e37e1d94259c6b5c29ab7e8… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: A test/tool_shed/functional/test_0310_hg_api_features.py R test/tool_shed/functional/test_0310_hg_clone.py Log Message: ----------- rename test to reflect insides Commit: 193eeaa60674eaa1badb65f74cb77dcb331b179b https://github.com/galaxyproject/galaxy/commit/193eeaa60674eaa1badb65f74cb7… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M config/tool_shed.ini.sample M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py M test/tool_shed/base/twilltestcase.py A test/tool_shed/functional/test_0310_hg_api_features.py R test/tool_shed/functional/test_0310_hg_push_from_api.py Log Message: ----------- Merge pull request #2056 from martenson/1601-disable-push [16.01] retroactively disable Mercurial push API in TS Commit: 90b95dc665bd736a21bd16d2852caf5c23bb83c4 https://github.com/galaxyproject/galaxy/commit/90b95dc665bd736a21bd16d2852c… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #2043 from martenson/update_mercurial_wheel [16.01] upgrade mercurial wheel to latest (fixing CVE issues) Commit: 20f61e6a2f36967e16a92cbcf8ad7f81ca76fb29 https://github.com/galaxyproject/galaxy/commit/20f61e6a2f36967e16a92cbcf8ad… Author: Marius van den Beek <m.vandenbeek(a)gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M lib/galaxy/workflow/modules.py Log Message: ----------- workaround for error message in case original toolshed had been disabled Commit: 65a7ebee23364a89d72e528bfcde6b1f6b3c5cd9 https://github.com/galaxyproject/galaxy/commit/65a7ebee23364a89d72e528bfcde… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M lib/galaxy/workflow/modules.py Log Message: ----------- Merge pull request #2072 from mvdbeek/backport_1738 [16.01] backport #1738 Commit: 2a53be67ad4ac99b6e9fe5fb803bfa44442dbd3c https://github.com/galaxyproject/galaxy/commit/2a53be67ad4ac99b6e9fe5fb803b… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M templates/webapps/galaxy/workflow/run.mako Log Message: ----------- Show sections in workflow run Commit: 3002e404ef17cd7db9b817085b2f3ed5a82bd109 https://github.com/galaxyproject/galaxy/commit/3002e404ef17cd7db9b817085b2f… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M templates/webapps/galaxy/workflow/run.mako Log Message: ----------- Patch in visual separation of section parameters Commit: 040410b1d3f0ea01374f183ee0b9447e0fc3cefb https://github.com/galaxyproject/galaxy/commit/040410b1d3f0ea01374f183ee0b9… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M templates/webapps/galaxy/workflow/run.mako Log Message: ----------- Merge pull request #2092 from erasche/workflow-section-backport [16.01] Workflow section fix backport Commit: 9ecf99c227466a586a6299e37555655f5ff79a25 https://github.com/galaxyproject/galaxy/commit/9ecf99c227466a586a6299e37555… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- make dependencies browsable again it would be denied previously as the dependency folder is outside of the repository (symlink protection) Commit: 0882b4d8fb31752f1fa8c963c3f260f975c918f7 https://github.com/galaxyproject/galaxy/commit/0882b4d8fb31752f1fa8c963c3f2… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/repository.py Log Message: ----------- use proper method for detecting admin Commit: 50268cb8ca4a5f812346a71cc640141781f22a3d https://github.com/galaxyproject/galaxy/commit/50268cb8ca4a5f812346a71cc640… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-07 (Thu, 07 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- fix missing call; add docs and refactor a bit Commit: 455113d182236a0fec880db296b746a413a8edc4 https://github.com/galaxyproject/galaxy/commit/455113d182236a0fec880db296b7… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-08 (Fri, 08 Apr 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Merge pull request #2101 from martenson/fix-browsing-dependencies [16.01] make dependencies browsable again Commit: f759961a29eeb28c6140d5d206bfd93fbdbfd379 https://github.com/galaxyproject/galaxy/commit/f759961a29eeb28c6140d5d206bf… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- mention planemo in the error message for disabled TS pushing rephrase to Norwegian Commit: fe4afefc42a45faca09c7c2aea34a97cad02be76 https://github.com/galaxyproject/galaxy/commit/fe4afefc42a45faca09c7c2aea34… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- Merge pull request #2114 from martenson/planemo-mention [16.01] mention planemo in the error message for disabled TS pushing Commit: cde04ad52d40b5d7b26a0c636d9d24bf6adbdc92 https://github.com/galaxyproject/galaxy/commit/cde04ad52d40b5d7b26a0c636d9d… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M lib/galaxy/web/framework/helpers/grids.py Log Message: ----------- markupsafe.escape() in Python2 does not work on str containing non-ASCII characters. Fix #2135. Commit: 2ebe9405106dfc16504e3b6f775425634bb4691f https://github.com/galaxyproject/galaxy/commit/2ebe9405106dfc16504e3b6f7754… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- load options from config, not from options Commit: ad952a4b8d7501d0df48e44d7c966ff22f9a63c4 https://github.com/galaxyproject/galaxy/commit/ad952a4b8d7501d0df48e44d7c96… Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2139 from martenson/fix-inactivity [16.01] load options from config, not from options Commit: 1e3b3a15581ecd62e78999f6be9e74d9e7cfbc65 https://github.com/galaxyproject/galaxy/commit/1e3b3a15581ecd62e78999f6be9e… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- fix the value passed to Masthead as options were options.config before Commit: 4c2bca51171efff42e2852bfa59a91d5acee3e73 https://github.com/galaxyproject/galaxy/commit/4c2bca51171efff42e2852bfa59a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2141 from martenson/fix-sideeffect [16.01] fix the value passed to Masthead as options were options.config before Commit: f85aaa4a27a1067a108c05fd1f74fa6060aa4565 https://github.com/galaxyproject/galaxy/commit/f85aaa4a27a1067a108c05fd1f74… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- port of middleware fix for TS (#2106) Commit: c0d65092fbbd1ad7380a0b17d3d9a949145d6170 https://github.com/galaxyproject/galaxy/commit/c0d65092fbbd1ad7380a0b17d3d9… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- Merge pull request #2154 from martenson/port-middleware-fix [16.01] Port middleware fix Commit: 03c85737319dbce1a3c9aa258c7c22d2d97d5c35 https://github.com/galaxyproject/galaxy/commit/03c85737319dbce1a3c9aa258c7c… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/history/multi-panel.js M static/maps/mvc/history/multi-panel.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/multi-panel.js Log Message: ----------- Multi-history: open rerun button in new tab Commit: e26bff23ed05eeeb7bac469b95a4ee6509dd537c https://github.com/galaxyproject/galaxy/commit/e26bff23ed05eeeb7bac469b95a4… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M lib/galaxy/web/framework/middleware/remoteuser.py M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge 'release_15.10' with 'release_16.01' Commit: 570baa5bb6020a2a8b7592dda8e952225ce7beec https://github.com/galaxyproject/galaxy/commit/570baa5bb6020a2a8b7592dda8e9… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Fix bad merge: when HTTP_GX_SECRET is None Commit: 68ce6ce49cc8c3d6f252a52a6bf9ac90f64328a3 https://github.com/galaxyproject/galaxy/commit/68ce6ce49cc8c3d6f252a52a6bf9… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M lib/galaxy/web/framework/middleware/remoteuser.py M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js M templates/webapps/galaxy/galaxy.panels.mako Log Message: ----------- Merge pull request #2169 from carlfeberhard/release_16.01 [16.01] Merge 15.10 with 16.01 Commit: 18c00899a30cd162cd0bb3a251a49cff2143d3a3 https://github.com/galaxyproject/galaxy/commit/18c00899a30cd162cd0bb3a251a4… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/web/framework/helpers/grids.py Log Message: ----------- Merge pull request #2138 from nsoranzo/release_16.01_fix_for_2135 [16.01] markupsafe.escape() in Python2 does not work on str containing non-ASCII characters Commit: e193e46e30d84d7f844a2941f72ed65af11f69b3 https://github.com/galaxyproject/galaxy/commit/e193e46e30d84d7f844a2941f72e… Author: Marius van den Beek <m.vandenbeek(a)gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Place $headers before integrity_check PBS needs the resource selection (which will be filled in using $headers) to appear before anything else (except the shebang), so this changes the order. Commit: 434321915a61f53cd668170da076251a8c15889f https://github.com/galaxyproject/galaxy/commit/434321915a61f53cd668170da076… Author: Marius van den Beek <m.vandenbeek(a)gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Use "$NCPUS" if defined to set GALAXY_SLOTS On our PBS cluster we do not have $PBS_NCPUS, and $PBS_NODEFILE contains the hostname of the nodes the task runs on. But we do have "$NCPUS" with the correct number of CPUS. Commit: 8e72b3095bacdac90a6fa7dea6125f489826bcfd https://github.com/galaxyproject/galaxy/commit/8e72b3095bacdac90a6fa7dea612… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Merge pull request #2174 from mvdbeek/reorder_job_template [16.01] Backport #2146 #2145 Commit: 3e79a574bea53731c734b568e1c6eeab4199cbdd https://github.com/galaxyproject/galaxy/commit/3e79a574bea53731c734b568e1c6… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/history/multi-panel.js M static/maps/mvc/history/multi-panel.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/multi-panel.js Log Message: ----------- Merge #2167 manually to resolve conflicts. Commit: 9e278de3959200a1432cca6ba33bc6e7ddd89b60 https://github.com/galaxyproject/galaxy/commit/9e278de3959200a1432cca6ba33b… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Rebuild client. Commit: b95cca862cae9cf7e78370fd68ea5f530fb8194f https://github.com/galaxyproject/galaxy/commit/b95cca862cae9cf7e78370fd68ea… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-library-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folder-view.js M static/scripts/mvc/library/library-library-view.js Log Message: ----------- always fetch new permissions as we are reusing the view Commit: e2f88296f8454e9195ad1a6f2d4c9c9ade40ee77 https://github.com/galaxyproject/galaxy/commit/e2f88296f8454e9195ad1a6f2d4c… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-18 (Mon, 18 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-library-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folder-view.js M static/scripts/mvc/library/library-library-view.js Log Message: ----------- Merge pull request #2176 from martenson/fix-permissions-caching [16.01] libraries: always fetch new permissions as we are reusing the view Commit: cfb8ed32693d6aad0ef26af7af7171e0e8c3ee04 https://github.com/galaxyproject/galaxy/commit/cfb8ed32693d6aad0ef26af7af71… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js Log Message: ----------- UI, citations: fix bad merge from 15.10 774487d created a difference between the imported name and the one used. Commit: 3737fc9487ad25ba09960e0d7858d4c15a3087bf https://github.com/galaxyproject/galaxy/commit/3737fc9487ad25ba09960e0d7858… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js Log Message: ----------- Merge pull request #2198 from carlfeberhard/fix.citations-again [16.01] UI, citations: fix bad merge from 15.10 Commit: ebb49d460b7cb5573a34cc386502a66594f8e3ad https://github.com/galaxyproject/galaxy/commit/ebb49d460b7cb5573a34cc386502… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Make client, somehow this got out of sync. Commit: 5aefe1b193d866185958645b832f2d731f933c01 https://github.com/galaxyproject/galaxy/commit/5aefe1b193d866185958645b832f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge pull request #2207 from dannon/release_16.01 [16.01] Rebuild client, maps were out of sync. Commit: b79474083b08860923f7f28fc1e7442b53f925db https://github.com/galaxyproject/galaxy/commit/b79474083b08860923f7f28fc1e7… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/citation/citation-model.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M config/tool_shed.ini.sample M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py M lib/galaxy/workflow/modules.py M lib/tool_shed/util/shed_util_common.py M static/maps/layout/page.js.map M static/maps/mvc/citation/citation-model.js.map M static/maps/mvc/history/multi-panel.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-library-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js M static/scripts/mvc/citation/citation-model.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folder-view.js M static/scripts/mvc/library/library-library-view.js M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/workflow/run.mako M test/tool_shed/base/twilltestcase.py A test/tool_shed/functional/test_0310_hg_api_features.py R test/tool_shed/functional/test_0310_hg_push_from_api.py Log Message: ----------- Merge pull request #2206 from dannon/master Sanity check of master update. Compare: https://github.com/galaxyproject/galaxy/compare/7c94ac8d93b8...b79474083b08

1 0

[galaxyproject/infrastructure-playbook] 8aa890: New TACC JS instances
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 8aa890745cf9ed67bc9364b74b7bd0bf3119f99e https://github.com/galaxyproject/infrastructure-playbook/commit/8aa890745cf… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M jetstreamtaccenv/group_vars/slurmclients.yml M jetstreamtaccenv/inventory Log Message: ----------- New TACC JS instances

1 0

[galaxyproject/galaxy] ebb49d: Make client, somehow this got out of sync.
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: ebb49d460b7cb5573a34cc386502a66594f8e3ad https://github.com/galaxyproject/galaxy/commit/ebb49d460b7cb5573a34cc386502… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Make client, somehow this got out of sync. Commit: 5aefe1b193d866185958645b832f2d731f933c01 https://github.com/galaxyproject/galaxy/commit/5aefe1b193d866185958645b832f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge pull request #2207 from dannon/release_16.01 [16.01] Rebuild client, maps were out of sync. Compare: https://github.com/galaxyproject/galaxy/compare/3737fc9487ad...5aefe1b193d8

1 0

[galaxyproject/galaxy] e9df73: Improve error message for data source tools, execu...
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e9df73c565ddb1f6a3858ca4fc1e9a422a2c727c https://github.com/galaxyproject/galaxy/commit/e9df73c565ddb1f6a3858ca4fc1e… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Improve error message for data source tools, executed through the tool_runner controller Commit: e88e615d6e6b10973aff3ed937649aafbf3f259e https://github.com/galaxyproject/galaxy/commit/e88e615d6e6b10973aff3ed93764… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Merge pull request #2204 from guerler/fix_error_message_000 [16.04] Improve error message for data source tools, executed through the tool_runner controller Commit: be588228869a921bf26b2d390b775b04699aba39 https://github.com/galaxyproject/galaxy/commit/be588228869a921bf26b2d390b77… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/97110e265525...be588228869a

1 0

[galaxyproject/galaxy] e9df73: Improve error message for data source tools, execu...
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: e9df73c565ddb1f6a3858ca4fc1e9a422a2c727c https://github.com/galaxyproject/galaxy/commit/e9df73c565ddb1f6a3858ca4fc1e… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Improve error message for data source tools, executed through the tool_runner controller Commit: e88e615d6e6b10973aff3ed937649aafbf3f259e https://github.com/galaxyproject/galaxy/commit/e88e615d6e6b10973aff3ed93764… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Merge pull request #2204 from guerler/fix_error_message_000 [16.04] Improve error message for data source tools, executed through the tool_runner controller Compare: https://github.com/galaxyproject/galaxy/compare/8749c82bef47...e88e615d6e6b

1 0

[galaxyproject/galaxy] c49e78: fix biomart url
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c49e7803fa1814abd04afb26b54965fb7af612ac https://github.com/galaxyproject/galaxy/commit/c49e7803fa1814abd04afb26b549… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M tools/data_source/biomart.xml Log Message: ----------- fix biomart url Commit: 7bed69ba17b4ce633c621ee34a7544115eb95970 https://github.com/galaxyproject/galaxy/commit/7bed69ba17b4ce633c621ee34a75… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M tools/data_source/biomart.xml Log Message: ----------- Specify Ensembl biomart server in descriptions. Commit: 1e7edf0bd7a003e0abc63c4f0a17fdfac535ade3 https://github.com/galaxyproject/galaxy/commit/1e7edf0bd7a003e0abc63c4f0a17… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M tools/data_source/biomart.xml Log Message: ----------- no parens Commit: 81cf234576bc1f52f93a11b193f6cc9c26130c28 https://github.com/galaxyproject/galaxy/commit/81cf234576bc1f52f93a11b193f6… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M tools/data_source/biomart.xml Log Message: ----------- Merge pull request #14 from dannon/fix_biomart Specify Ensembl biomart server in descriptions. Commit: cc4911019077c5c6e1b4ec293670020f34aed596 https://github.com/galaxyproject/galaxy/commit/cc4911019077c5c6e1b4ec293670… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Enhance to_json such that it can be safely called multiple times Commit: f5060628d2de4802be610fd6caf5c878afdb4312 https://github.com/galaxyproject/galaxy/commit/f5060628d2de4802be610fd6caf5… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/util/sanitize_html.py Log Message: ----------- Fix pages encoding. Using str on previously unicodify'd extended set values does not work. ``` In [2]: str("Blah blah blah, this breaks the page: ಠ_ಠ") Out[2]: 'Blah blah blah, this breaks the page: \xe0\xb2\xa0_\xe0\xb2\xa0' In [3]: str(unicodify("Blah blah blah, this breaks the page: ಠ_ಠ")) --------------------------------------------------------------------------- UnicodeEncodeError Traceback (most recent call last) <ipython-input-3-4a83f5e5f5c8> in <module>() ----> 1 str(unicodify("Blah blah blah, this breaks the page: ಠ_ಠ")) UnicodeEncodeError: 'ascii' codec can't encode character u'\u0ca0' in position 38: ordinal not in range(128) ``` Commit: 659a900693b72886fd27731a2568ce71657c4401 https://github.com/galaxyproject/galaxy/commit/659a900693b72886fd27731a2568… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/util/sanitize_html.py Log Message: ----------- Simplify expression, trust upstream pieces. Commit: e13738868519d8c7c6f7dec8cfd598f7929b8828 https://github.com/galaxyproject/galaxy/commit/e13738868519d8c7c6f7dec8cfd5… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Apply parameter translation for data source tools Commit: 7c7d6edbfd94e5b3e187778b89ac1febb5690cb9 https://github.com/galaxyproject/galaxy/commit/7c7d6edbfd94e5b3e187778b89ac… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/util/validation.py Log Message: ----------- Swap validate_and_sanitize_basestring to use unicodify Commit: a9280649b201dc8c1ce6e1601c5baaae211acbd7 https://github.com/galaxyproject/galaxy/commit/a9280649b201dc8c1ce6e1601c5b… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Sync job_script module with Pulsar to fix doctest. Following test fails without this change and is fixed by it. ``` nosetests --with-doctest lib/galaxy/jobs/runners/util/job_script ``` I'm not sure why Travis doesn't pick this up - I should figure that out. Commit: 0cde386a2cfec1c18f68f1dfd939843328f8046f https://github.com/galaxyproject/galaxy/commit/0cde386a2cfec1c18f68f1dfd939… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/util/validation.py Log Message: ----------- Remove more unnecessary unicode/text_type, since sanitize_html will always return unicode. Commit: eac0fb9b26c6c52ab695d58cef13c73d3d2566b4 https://github.com/galaxyproject/galaxy/commit/eac0fb9b26c6c52ab695d58cef13… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Merge pull request #2201 from guerler/fix_parameters_000 [16.04] Translate data source tool parameters on parameter expansion Commit: 4ea53d99aaa20b15e1d09f7140dff14336360686 https://github.com/galaxyproject/galaxy/commit/4ea53d99aaa20b15e1d09f7140df… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #2196 from guerler/extend_to_json_000 [16.04] Extend to_json for dataset tool parameters Commit: e5290e1964fcfc49fb5f57a232e4bcc35c28a52a https://github.com/galaxyproject/galaxy/commit/e5290e1964fcfc49fb5f57a232e4… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M tools/data_source/biomart.xml Log Message: ----------- Merge pull request #2149 from martenson/fix-biomart [16.04] fix/replace biomart data source Commit: adbc66873a13dc3c6cbcbf86181f935d09fed490 https://github.com/galaxyproject/galaxy/commit/adbc66873a13dc3c6cbcbf86181f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Merge pull request #2203 from jmchilton/doctest_fix [16.04] Sync job_script module with Pulsar to fix doctest. Commit: 8749c82bef4789d810313a3fd853202a1748c63a https://github.com/galaxyproject/galaxy/commit/8749c82bef4789d810313a3fd853… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/util/sanitize_html.py M lib/galaxy/util/validation.py Log Message: ----------- Merge pull request #2197 from dannon/pages_parser_fix [16.04] Pages parser fix Commit: 97110e2655255bf752bb00ca7df046f9c9e016cb https://github.com/galaxyproject/galaxy/commit/97110e2655255bf752bb00ca7df0… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/util/validation.py M tools/data_source/biomart.xml Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/c79d057ca459...97110e265525

1 0

[galaxyproject/galaxy] f50606: Fix pages encoding. Using str on previously unico...
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: f5060628d2de4802be610fd6caf5c878afdb4312 https://github.com/galaxyproject/galaxy/commit/f5060628d2de4802be610fd6caf5… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/util/sanitize_html.py Log Message: ----------- Fix pages encoding. Using str on previously unicodify'd extended set values does not work. ``` In [2]: str("Blah blah blah, this breaks the page: ಠ_ಠ") Out[2]: 'Blah blah blah, this breaks the page: \xe0\xb2\xa0_\xe0\xb2\xa0' In [3]: str(unicodify("Blah blah blah, this breaks the page: ಠ_ಠ")) --------------------------------------------------------------------------- UnicodeEncodeError Traceback (most recent call last) <ipython-input-3-4a83f5e5f5c8> in <module>() ----> 1 str(unicodify("Blah blah blah, this breaks the page: ಠ_ಠ")) UnicodeEncodeError: 'ascii' codec can't encode character u'\u0ca0' in position 38: ordinal not in range(128) ``` Commit: 659a900693b72886fd27731a2568ce71657c4401 https://github.com/galaxyproject/galaxy/commit/659a900693b72886fd27731a2568… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/util/sanitize_html.py Log Message: ----------- Simplify expression, trust upstream pieces. Commit: 7c7d6edbfd94e5b3e187778b89ac1febb5690cb9 https://github.com/galaxyproject/galaxy/commit/7c7d6edbfd94e5b3e187778b89ac… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M lib/galaxy/util/validation.py Log Message: ----------- Swap validate_and_sanitize_basestring to use unicodify Commit: 0cde386a2cfec1c18f68f1dfd939843328f8046f https://github.com/galaxyproject/galaxy/commit/0cde386a2cfec1c18f68f1dfd939… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/util/validation.py Log Message: ----------- Remove more unnecessary unicode/text_type, since sanitize_html will always return unicode. Commit: 8749c82bef4789d810313a3fd853202a1748c63a https://github.com/galaxyproject/galaxy/commit/8749c82bef4789d810313a3fd853… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/util/sanitize_html.py M lib/galaxy/util/validation.py Log Message: ----------- Merge pull request #2197 from dannon/pages_parser_fix [16.04] Pages parser fix Compare: https://github.com/galaxyproject/galaxy/compare/adbc66873a13...8749c82bef47

1 0

[galaxyproject/galaxy] a92806: Sync job_script module with Pulsar to fix doctest.
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: a9280649b201dc8c1ce6e1601c5baaae211acbd7 https://github.com/galaxyproject/galaxy/commit/a9280649b201dc8c1ce6e1601c5b… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Sync job_script module with Pulsar to fix doctest. Following test fails without this change and is fixed by it. ``` nosetests --with-doctest lib/galaxy/jobs/runners/util/job_script ``` I'm not sure why Travis doesn't pick this up - I should figure that out. Commit: adbc66873a13dc3c6cbcbf86181f935d09fed490 https://github.com/galaxyproject/galaxy/commit/adbc66873a13dc3c6cbcbf86181f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Merge pull request #2203 from jmchilton/doctest_fix [16.04] Sync job_script module with Pulsar to fix doctest. Compare: https://github.com/galaxyproject/galaxy/compare/e5290e1964fc...adbc66873a13

1 0

[galaxyproject/galaxy] 1aa8eb: Attempted fix for server error on repo preview.
by GitHub 20 Apr '16

20 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1aa8eb980aac5503a6cf585241fe974899922557 https://github.com/galaxyproject/galaxy/commit/1aa8eb980aac5503a6cf585241fe… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M lib/tool_shed/util/metadata_util.py Log Message: ----------- Attempted fix for server error on repo preview. This should handle cases where the database record specifies a repository dependency, but the repository in question (and its downloadable changeset) has been updated since the dependency was created. Commit: ad929f231076706167cd88274bcf7c074e74fac4 https://github.com/galaxyproject/galaxy/commit/ad929f231076706167cd88274bcf… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: A test/shed_functional/functional/test_0550_metadata_updated_dependencies.py A test/shed_functional/test_data/0550_files/filtering_1.0.tgz A test/shed_functional/test_data/0550_files/package_freebayes_1_0550.tgz A test/shed_functional/test_data/0550_files/package_freebayes_2_0550.tgz A test/shed_functional/test_data/0550_files/package_samtools_1_0550.tgz A test/shed_functional/test_data/0550_files/package_samtools_2_0550.tgz A test/shed_functional/test_data/0550_files/temp/tool_dependencies.xml Log Message: ----------- Add test for server error with updated repository. Commit: 8c3f458bca948fc5efda027a4e09b8b5b8289276 https://github.com/galaxyproject/galaxy/commit/8c3f458bca948fc5efda027a4e09… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M test/shed_functional/functional/test_0550_metadata_updated_dependencies.py Log Message: ----------- Correct docs and names. Commit: f4993b782679096f2576e749b146c76b45397314 https://github.com/galaxyproject/galaxy/commit/f4993b782679096f2576e749b146… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M test/shed_functional/functional/test_0550_metadata_updated_dependencies.py Log Message: ----------- Fix one more travis error. Commit: 78e2eef2fcb4bcc51f26307ee351a3c5a679c300 https://github.com/galaxyproject/galaxy/commit/78e2eef2fcb4bcc51f26307ee351… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M test/shed_functional/functional/test_0550_metadata_updated_dependencies.py Log Message: ----------- Fix another travis error that escaped my notice. Commit: d8b0add9c20bf6aee7c96d1c6106178cbf72cb3d https://github.com/galaxyproject/galaxy/commit/d8b0add9c20bf6aee7c96d1c6106… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M .ci/py3_sources.txt M .gitignore M Makefile R buildbot_setup.sh M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/style/less/base.less M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/job_conf.xml.sample_advanced A config/plugins/interactive_environments/jupyter/config/allowed_images.yml.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/jupyter/templates/jupyter.mako A config/plugins/interactive_environments/rstudio/config/allowed_images.yml.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M config/tool_data_table_conf.xml.sample M contrib/galaxy.debian-init A contrib/galaxy_supervisor.conf A display_applications/biom/biom_simple.xml R install_and_test_tool_shed_repositories.sh M lib/galaxy/config.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/issue1818.tabular M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/cli.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/pbs.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/managers/configuration.py M lib/galaxy/model/__init__.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/cwl/parser.py M lib/galaxy/tools/cwl/runtime_actions.py M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/errors.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/lineages/factory.py M lib/galaxy/util/__init__.py M lib/galaxy/util/log/fluent_log.py M lib/galaxy/version.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/helpers/__init__.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/workflow/modules.py R lib/tool_shed/scripts/api/add_repository_registry_entry.py R lib/tool_shed/scripts/api/common.py R lib/tool_shed/scripts/api/create_categories.py R lib/tool_shed/scripts/api/create_users.py R lib/tool_shed/scripts/api/export.py R lib/tool_shed/scripts/api/get_filtered_repository_revisions.py R lib/tool_shed/scripts/api/import_capsule.py R lib/tool_shed/scripts/api/remove_repository_registry_entry.py R lib/tool_shed/scripts/api/reset_metadata_on_repositories.py R lib/tool_shed/scripts/api/tool_shed_repository_revision_update.py R lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_tool_shed.sh R lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py R lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py R lib/tool_shed/scripts/bootstrap_tool_shed/parse_run_sh_args.sh R lib/tool_shed/scripts/bootstrap_tool_shed/user_info.xml.sample R lib/tool_shed/scripts/check_filesystem_for_empty_tool_dependency_installation_paths.py R lib/tool_shed/scripts/check_repositories_for_functional_tests.py R lib/tool_shed/scripts/check_s3_for_empty_tool_dependency_installation_paths.py R lib/tool_shed/scripts/check_tool_dependency_definition_repositories.py R lib/tool_shed/scripts/clean_up_tool_dependency_directory.py R lib/tool_shed/scripts/deprecate_repositories_without_metadata.py R lib/tool_shed/scripts/show_tool_dependency_installation_dir_contents.py M lib/tool_shed/util/shed_util_common.py M run_tests.sh M run_tool_shed.sh M scripts/bootstrap_history.py M scripts/functional_tests.py A scripts/tool_shed/api/add_repository_registry_entry.py A scripts/tool_shed/api/common.py A scripts/tool_shed/api/create_categories.py A scripts/tool_shed/api/create_users.py A scripts/tool_shed/api/export.py A scripts/tool_shed/api/get_filtered_repository_revisions.py A scripts/tool_shed/api/import_capsule.py A scripts/tool_shed/api/remove_repository_registry_entry.py A scripts/tool_shed/api/reset_metadata_on_repositories.py A scripts/tool_shed/api/tool_shed_repository_revision_update.py A scripts/tool_shed/bootstrap_tool_shed/bootstrap_tool_shed.sh A scripts/tool_shed/bootstrap_tool_shed/bootstrap_util.py A scripts/tool_shed/bootstrap_tool_shed/create_user_with_api_key.py A scripts/tool_shed/bootstrap_tool_shed/parse_run_sh_args.sh A scripts/tool_shed/bootstrap_tool_shed/user_info.xml.sample A scripts/tool_shed/check_filesystem_for_empty_tool_dependency_installation_paths.py A scripts/tool_shed/check_s3_for_empty_tool_dependency_installation_paths.py A scripts/tool_shed/clean_up_tool_dependency_directory.py A scripts/tool_shed/deprecate_repositories_without_metadata.py A scripts/tool_shed/show_tool_dependency_installation_dir_contents.py M static/maps/layout/menu.js.map M static/maps/mvc/tool/tool-form-workflow.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/mvc/tool/tool-form-workflow.js M static/style/blue/base.css M templates/sharing_base.mako M templates/webapps/galaxy/admin/index.mako A templates/webapps/galaxy/visualization/gie.mako R templates/webapps/galaxy/workflow/export.mako M templates/webapps/galaxy/workflow/list.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako M templates/webapps/tool_shed/repository/view_changeset.mako M test/base/driver_util.py A test/base/integration_util.py M test/casperjs/casperjs_runner.py A test/integration/__init__.py A test/integration/embedded_pulsar_job_conf.xml A test/integration/test_pulsar_embedded.py M test/shed_functional/base/twilltestcase.py M test/unit/jobs/test_command_factory.py M test/unit/tools/test_conda_resolution.py A tool-data/biom_simple_display.loc.sample Log Message: ----------- Merge branch 'dev' of git://github.com/galaxyproject/galaxy into api_install_bugfixes Commit: afa353b6fd00eb0ecf1d4bac9d64751537cae12a https://github.com/galaxyproject/galaxy/commit/afa353b6fd00eb0ecf1d4bac9d64… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/tool_shed/util/shed_util_common.py M test/shed_functional/functional/test_0540_get_all_metadata_from_api.py Log Message: ----------- Return current changeset if it is latest. Commit: d35d6a707f3b265b10b859714deec793ecf31a53 https://github.com/galaxyproject/galaxy/commit/d35d6a707f3b265b10b859714dee… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Update documentation. Commit: 4c126af1b0137fad228f0254dab45b6bec8fb9da https://github.com/galaxyproject/galaxy/commit/4c126af1b0137fad228f0254dab4… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/api/repository_revisions.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/dependencies/repository/relation_builder.py M lib/tool_shed/util/metadata_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Ensure legacy behavior remains unaltered. Per to the logic change in shed_util_common.get_next_downloadable_changeset_revision, this commit modifies some conditionals to check whether it previously would have returned None. Commit: e1b167b312385df2a02fb5c7d4c4c464e3733bd7 https://github.com/galaxyproject/galaxy/commit/e1b167b312385df2a02fb5c7d4c4… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/api/repository_revisions.py Log Message: ----------- Remove extra else statement. Commit: 50757a13baf060601b681795403ba503a8897ede https://github.com/galaxyproject/galaxy/commit/50757a13baf060601b681795403b… Author: Dave Bouvier <dave(a)bx.psu.edu> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/tool_shed/util/metadata_util.py Log Message: ----------- Fix test 0550. Commit: c79d057ca459586f4a01d50158d36530d0cbb163 https://github.com/galaxyproject/galaxy/commit/c79d057ca459586f4a01d50158d3… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/api/repository_revisions.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/dependencies/repository/relation_builder.py M lib/tool_shed/util/metadata_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/shed_util_common.py M test/shed_functional/functional/test_0540_get_all_metadata_from_api.py A test/shed_functional/functional/test_0550_metadata_updated_dependencies.py A test/shed_functional/test_data/0550_files/filtering_1.0.tgz A test/shed_functional/test_data/0550_files/package_freebayes_1_0550.tgz A test/shed_functional/test_data/0550_files/package_freebayes_2_0550.tgz A test/shed_functional/test_data/0550_files/package_samtools_1_0550.tgz A test/shed_functional/test_data/0550_files/package_samtools_2_0550.tgz A test/shed_functional/test_data/0550_files/temp/tool_dependencies.xml Log Message: ----------- Merge pull request #2079 from davebx/api_install_bugfixes Attempted fix for server error on repo preview. Compare: https://github.com/galaxyproject/galaxy/compare/9b5fdbf9a497...c79d057ca459

1 0