November 2015 - galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] 7a4be8: fix missing configuration; broke TS password reset
by GitHub 26 Nov '15

26 Nov '15

Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 7a4be88693d8541827cf47f8d7dd3989eef84ef7 https://github.com/galaxyproject/galaxy/commit/7a4be88693d8541827cf47f8d7dd… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/config.py Log Message: ----------- fix missing configuration; broke TS password reset Commit: aa52b6cff1d4b694a96a1b37da263a72cbd3a726 https://github.com/galaxyproject/galaxy/commit/aa52b6cff1d4b694a96a1b37da26… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M config/tool_shed.ini.sample Log Message: ----------- add pretty_datetime_format to TS config sample Commit: d89670e939d86e6b57988fe14c5695f457b751e2 https://github.com/galaxyproject/galaxy/commit/d89670e939d86e6b57988fe14c56… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M config/tool_shed.ini.sample M lib/galaxy/webapps/tool_shed/config.py Log Message: ----------- Merge pull request #1170 from martenson/fix-password-reset [15.10] fix missing configuration which broke TS password reset Compare: https://github.com/galaxyproject/galaxy/compare/82ce6244653f...d89670e939d8

1 0

[galaxyproject/usegalaxy-playbook] e1ce91: update mutable confs on Test
by GitHub 25 Nov '15

25 Nov '15

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: e1ce9175fd23fa3af6f6389f17a31d66f5ddbae2 https://github.com/galaxyproject/usegalaxy-playbook/commit/e1ce9175fd23fa3a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml M files/galaxy/test.galaxyproject.org/var/shed_data_manager_conf.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_conf.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_data_table_conf.xml Log Message: ----------- update mutable confs on Test

1 0

[galaxyproject/usegalaxy-playbook] 3ccada: update Test for a change...
by GitHub 25 Nov '15

25 Nov '15

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 3ccada13afe38f35d861cd88a38a019b8395da56 https://github.com/galaxyproject/usegalaxy-playbook/commit/3ccada13afe38f35… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M stage/group_vars/all.yml Log Message: ----------- update Test for a change...

1 0

[galaxyproject/usegalaxy-playbook] 292816: Revert "update TTS"
by GitHub 25 Nov '15

25 Nov '15

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 292816b71a8244991500f52b87128067e73bb48c https://github.com/galaxyproject/usegalaxy-playbook/commit/292816b71a824499… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M stage/group_vars/toolshedservers.yml Log Message: ----------- Revert "update TTS" This reverts commit 7fb048393b5682c1139be2c3e927788659966d80.

1 0

[galaxyproject/galaxy] 1ea68f: Save a query per output during tool execution.
by GitHub 25 Nov '15

25 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1ea68f938408b72f8f0f4ebe2545550baea85037 https://github.com/galaxyproject/galaxy/commit/1ea68f938408b72f8f0f4ebe2545… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M lib/galaxy/security/__init__.py M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Save a query per output during tool execution. Commit: 42d006162c095669a2c7afe1ab0f1fb67b000798 https://github.com/galaxyproject/galaxy/commit/42d006162c095669a2c7afe1ab0f… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Another tool dataset creation optimization... Rather than using three transactions to create an HDA, a dataset, and its roles - do this all in one transaction. Commit: 01c57908eaf8bd589ce8738fdab14d415543d072 https://github.com/galaxyproject/galaxy/commit/01c57908eaf8bd589ce8738fdab1… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Another tool execution optimization... Prefetch all groups, roles, and associations when using User.all_users(). This reduces three queries down to one if the user has no groups or group roles and only belongs to the private user role, obviously the number of queries saved would increase more and more if the user belonged to multiple roles or groups. Commit: 11edf3559d7092c9e3fada3f04d9291bea64f2f0 https://github.com/galaxyproject/galaxy/commit/11edf3559d7092c9e3fada3f04d9… Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Merge pull request #1166 from jmchilton/tool_opts_2 Another set of tool execution optimizations Compare: https://github.com/galaxyproject/galaxy/compare/853efcea14d1...11edf3559d70

1 0

[galaxyproject/usegalaxy-playbook] 7fb048: update TTS
by GitHub 25 Nov '15

25 Nov '15

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 7fb048393b5682c1139be2c3e927788659966d80 https://github.com/galaxyproject/usegalaxy-playbook/commit/7fb048393b5682c1… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M stage/group_vars/toolshedservers.yml Log Message: ----------- update TTS

1 0

[galaxyproject/galaxy] 32728e: Small optimizations to running tools.
by GitHub 25 Nov '15

25 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 32728e23921553c75fda61acadb4f5dc82a4f915 https://github.com/galaxyproject/galaxy/commit/32728e23921553c75fda61acadb4… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Small optimizations to running tools. Commit: 853efcea14d1ce11961d171324dbce03e6694117 https://github.com/galaxyproject/galaxy/commit/853efcea14d1ce11961d171324db… Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Merge pull request #1163 from jmchilton/tool_opts_1 Small optimizations to running tools. Compare: https://github.com/galaxyproject/galaxy/compare/77166a7295b1...853efcea14d1

1 0

[galaxyproject/galaxy] 9cc8e0: add local grunt-cli dependency for qunit tests
by GitHub 24 Nov '15

24 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9cc8e08537291a85885ee3ad52daeb36b95b4f8e https://github.com/galaxyproject/galaxy/commit/9cc8e08537291a85885ee3ad52da… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-23 (Mon, 23 Nov 2015) Changed paths: M test/qunit/package.json Log Message: ----------- add local grunt-cli dependency for qunit tests Commit: 77166a7295b1fe13f366414361b1752e6c0dd953 https://github.com/galaxyproject/galaxy/commit/77166a7295b1fe13f366414361b1… Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com> Date: 2015-11-23 (Mon, 23 Nov 2015) Changed paths: M test/qunit/package.json Log Message: ----------- Merge pull request #1159 from martenson/local-grunt-cli-dep add local grunt-cli dependency for qunit tests Compare: https://github.com/galaxyproject/galaxy/compare/3cadcdffb51f...77166a7295b1

1 0

[galaxyproject/galaxy] b6451d: Fix bugs in test and code introduced in PR #1113.
by GitHub 24 Nov '15

24 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b6451d0be60a3bf2ca7c65c7700cb7361cb50754 https://github.com/galaxyproject/galaxy/commit/b6451d0be60a3bf2ca7c65c7700c… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-23 (Mon, 23 Nov 2015) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/functional/tools/output_format_collection.xml M test/unit/tools/test_actions.py Log Message: ----------- Fix bugs in test and code introduced in PR #1113. Commit: 3cadcdffb51f3994ed6ca0f4a9508f31fba1c4a6 https://github.com/galaxyproject/galaxy/commit/3cadcdffb51f3994ed6ca0f4a950… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-23 (Mon, 23 Nov 2015) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/functional/tools/output_format_collection.xml M test/unit/tools/test_actions.py Log Message: ----------- Merge pull request #1155 from nsoranzo/fix_for_1113 Fix bugs in test and code introduced in PR #1113. Compare: https://github.com/galaxyproject/galaxy/compare/11f9fed4acb3...3cadcdffb51f

1 0

[galaxyproject/galaxy] 82ce62: Fix for re-installing an uninstalled TS repository...
by GitHub 24 Nov '15

24 Nov '15

Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 82ce6244653fe96f01f4b01bb4ecd366a1b45db0 https://github.com/galaxyproject/galaxy/commit/82ce6244653fe96f01f4b01bb4ec… Author: Greg Von Kuster <ghv2(a)psu.edu> Date: 2015-11-23 (Mon, 23 Nov 2015) Changed paths: M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Fix for re-installing an uninstalled TS repository with a dependency where both the repository and the dependency were updated in the TS after the repository was uninstalled.

1 0