- galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] 3e0e96: add work on release notes 16.10, improve docs for ...
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: 3e0e96657d765f4023bb6801ace2e96a1ffc4505 https://github.com/galaxyproject/galaxy/commit/3e0e96657d765f4023bb6801ace2… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/admin/index.rst M doc/source/admin/webhooks.rst M doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst Log Message: ----------- add work on release notes 16.10, improve docs for webhooks Conflicts: doc/source/releases/16.10.rst doc/source/releases/16.10_announce.rst Commit: 739fb59cba5b7747a32e685a3632f96effad4c11 https://github.com/galaxyproject/galaxy/commit/739fb59cba5b7747a32e685a3632… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/admin/webhooks.rst Log Message: ----------- fix the fix Commit: 5784a838a554f8dcf9e132e26be01240a37a3e65 https://github.com/galaxyproject/galaxy/commit/5784a838a554f8dcf9e132e26be0… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/releases/16.10.rst Log Message: ----------- fix bad merge Commit: 83de83e7edc230d7f9841a6d9770d87d0c89d06f https://github.com/galaxyproject/galaxy/commit/83de83e7edc230d7f9841a6d9770… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M doc/source/admin/index.rst M doc/source/admin/webhooks.rst M doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst Log Message: ----------- Merge pull request #3282 from martenson/release_16.10 [16.10] work on release notes 16.10 Compare: https://github.com/galaxyproject/galaxy/compare/d0f39ceff518...83de83e7edc2

1 0

[galaxyproject/galaxy] a84601: Add 16.10 release notes.
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a84601ba80cb8620a396e740e9a69f3d6f1dfd37 https://github.com/galaxyproject/galaxy/commit/a84601ba80cb8620a396e740e9a6… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: A doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst A doc/source/releases/17.01_announce.rst M scripts/bootstrap_history.py Log Message: ----------- Add 16.10 release notes. Commit: 8766e125091d0a5a83a0fd4daf274fe93551a443 https://github.com/galaxyproject/galaxy/commit/8766e125091d0a5a83a0fd4daf27… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Escape filename in upload dialog, default and composite. Pointed out by David Wyde. Commit: 13ab07030c8ffa5012a123671c2ab450bf14c40b https://github.com/galaxyproject/galaxy/commit/13ab07030c8ffa5012a123671c2a… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/default/default-row.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Use consistent spacing. Commit: 75d327f165c730f95e181a2feff1db64074ab3e6 https://github.com/galaxyproject/galaxy/commit/75d327f165c730f95e181a2feff1… Author: Aysam Guerler <aysam.guerler(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Merge pull request #3278 from dannon/upload_escape_filename [16.10] Escape filename in upload dialog, default and composite. Commit: f6b94dc465a41e0ce25cd0d38b8cfa81ab4c5254 https://github.com/galaxyproject/galaxy/commit/f6b94dc465a41e0ce25cd0d38b8c… Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M lib/tool_shed/util/tool_util.py Log Message: ----------- Fix for ToolShed install when copied sample data target exists, but is broken symlink. Commit: 70fc43b24090e537479a74b34a7ff9bc4e43de84 https://github.com/galaxyproject/galaxy/commit/70fc43b24090e537479a74b34a7f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M lib/tool_shed/util/tool_util.py Log Message: ----------- Merge pull request #3279 from blankenberg/16.10_ts_install_broken_symlink [16.10] Fix for ToolShed install when copied sample data target exists, but is broken symlink. Commit: d0f39ceff51843a95048dfdaf49035d07ce75c1d https://github.com/galaxyproject/galaxy/commit/d0f39ceff51843a95048dfdaf490… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: A doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst A doc/source/releases/17.01_announce.rst M scripts/bootstrap_history.py Log Message: ----------- Merge pull request #3270 from jmchilton/16.10_release_notes_0 [16.10] Add 16.10 release notes. Commit: cbd527b9a4671c7abe9a22cf69e869b5d2de858a https://github.com/galaxyproject/galaxy/commit/cbd527b9a4671c7abe9a22cf69e8… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js A doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst A doc/source/releases/17.01_announce.rst M lib/tool_shed/util/tool_util.py M scripts/bootstrap_history.py M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Merge branch 'release_16.10' into dev Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/33dec01ba218...cbd527b9a467

1 0

[galaxyproject/galaxy] a84601: Add 16.10 release notes.
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: a84601ba80cb8620a396e740e9a69f3d6f1dfd37 https://github.com/galaxyproject/galaxy/commit/a84601ba80cb8620a396e740e9a6… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: A doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst A doc/source/releases/17.01_announce.rst M scripts/bootstrap_history.py Log Message: ----------- Add 16.10 release notes. Commit: d0f39ceff51843a95048dfdaf49035d07ce75c1d https://github.com/galaxyproject/galaxy/commit/d0f39ceff51843a95048dfdaf490… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: A doc/source/releases/16.10.rst M doc/source/releases/16.10_announce.rst A doc/source/releases/17.01_announce.rst M scripts/bootstrap_history.py Log Message: ----------- Merge pull request #3270 from jmchilton/16.10_release_notes_0 [16.10] Add 16.10 release notes. Compare: https://github.com/galaxyproject/galaxy/compare/70fc43b24090...d0f39ceff518

1 0

[galaxyproject/galaxy] f6b94d: Fix for ToolShed install when copied sample data t...
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: f6b94dc465a41e0ce25cd0d38b8cfa81ab4c5254 https://github.com/galaxyproject/galaxy/commit/f6b94dc465a41e0ce25cd0d38b8c… Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M lib/tool_shed/util/tool_util.py Log Message: ----------- Fix for ToolShed install when copied sample data target exists, but is broken symlink. Commit: 70fc43b24090e537479a74b34a7ff9bc4e43de84 https://github.com/galaxyproject/galaxy/commit/70fc43b24090e537479a74b34a7f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M lib/tool_shed/util/tool_util.py Log Message: ----------- Merge pull request #3279 from blankenberg/16.10_ts_install_broken_symlink [16.10] Fix for ToolShed install when copied sample data target exists, but is broken symlink. Compare: https://github.com/galaxyproject/galaxy/compare/75d327f165c7...70fc43b24090

1 0

[galaxyproject/galaxy] 8766e1: Escape filename in upload dialog, default and comp...
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: 8766e125091d0a5a83a0fd4daf274fe93551a443 https://github.com/galaxyproject/galaxy/commit/8766e125091d0a5a83a0fd4daf27… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Escape filename in upload dialog, default and composite. Pointed out by David Wyde. Commit: 13ab07030c8ffa5012a123671c2ab450bf14c40b https://github.com/galaxyproject/galaxy/commit/13ab07030c8ffa5012a123671c2a… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/default/default-row.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Use consistent spacing. Commit: 75d327f165c730f95e181a2feff1db64074ab3e6 https://github.com/galaxyproject/galaxy/commit/75d327f165c730f95e181a2feff1… Author: Aysam Guerler <aysam.guerler(a)gmail.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Merge pull request #3278 from dannon/upload_escape_filename [16.10] Escape filename in upload dialog, default and composite. Compare: https://github.com/galaxyproject/galaxy/compare/8a5ff5df21ef...75d327f165c7

1 0

[galaxyproject/usegalaxy-playbook] 0426a2: Update log archival for zerg mode
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 0426a2361c865956c297f55561e9ff1c0bb9df51 https://github.com/galaxyproject/usegalaxy-playbook/commit/0426a2361c865956… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M roles/usegalaxy_privileged/templates/archive_logs.sh.j2 Log Message: ----------- Update log archival for zerg mode

1 0

[galaxyproject/usegalaxy-playbook] 41fae2: Add env vars to Test jobs
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 41fae21828b968cf2c31aa08e2dfe877203b572f https://github.com/galaxyproject/usegalaxy-playbook/commit/41fae21828b968cf… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M files/galaxy/usegalaxy.org/var/integrated_tool_panel.xml M templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2 Log Message: ----------- Add env vars to Test jobs

1 0

[galaxyproject/galaxy] a1e396: Fix tour URLs in welcome
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a1e3965eaf7e850486d289d1a2026877177b3c27 https://github.com/galaxyproject/galaxy/commit/a1e3965eaf7e850486d289d1a202… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M static/welcome.html.sample Log Message: ----------- Fix tour URLs in welcome Commit: 8a5ff5df21efc6db7d2df47171f7cbad5cb1f608 https://github.com/galaxyproject/galaxy/commit/8a5ff5df21efc6db7d2df47171f7… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M static/welcome.html.sample Log Message: ----------- Merge pull request #3277 from dannon/fix_tour_welcome_1610 [16.10] port Fix tour URLs in welcome Commit: 33dec01ba2183d2f980947cc467dfab7f9bf4ddb https://github.com/galaxyproject/galaxy/commit/33dec01ba2183d2f980947cc467d… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-12-07 (Wed, 07 Dec 2016) Log Message: ----------- Merge branch 'release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/cd1ae6b9d26a...33dec01ba218

1 0

[galaxyproject/galaxy] a1e396: Fix tour URLs in welcome
by GitHub 07 Dec '16

07 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: a1e3965eaf7e850486d289d1a2026877177b3c27 https://github.com/galaxyproject/galaxy/commit/a1e3965eaf7e850486d289d1a202… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M static/welcome.html.sample Log Message: ----------- Fix tour URLs in welcome Commit: 8a5ff5df21efc6db7d2df47171f7cbad5cb1f608 https://github.com/galaxyproject/galaxy/commit/8a5ff5df21efc6db7d2df47171f7… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M static/welcome.html.sample Log Message: ----------- Merge pull request #3277 from dannon/fix_tour_welcome_1610 [16.10] port Fix tour URLs in welcome Compare: https://github.com/galaxyproject/galaxy/compare/d0ad2ae1ce29...8a5ff5df21ef

1 0

[galaxyproject/galaxy] d7c6f3: Increase release delta to 4 months ahead of 17.05.
by GitHub 06 Dec '16

06 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d7c6f39a9eb8b117c1fe8f98af1aa3bb527be953 https://github.com/galaxyproject/galaxy/commit/d7c6f39a9eb8b117c1fe8f98af1a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M scripts/bootstrap_history.py Log Message: ----------- Increase release delta to 4 months ahead of 17.05. Commit: 45afe7aa61478d88b7b99c08429f4012328247d1 https://github.com/galaxyproject/galaxy/commit/45afe7aa61478d88b7b99c08429f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M scripts/bootstrap_history.py Log Message: ----------- fix typo Commit: cd1ae6b9d26ac3bbb83adcfc0c058221df43ac5a https://github.com/galaxyproject/galaxy/commit/cd1ae6b9d26ac3bbb83adcfc0c05… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M scripts/bootstrap_history.py Log Message: ----------- Merge pull request #3271 from jmchilton/increase_release_timing Increase release delta to 4 months ahead of 17.05. Compare: https://github.com/galaxyproject/galaxy/compare/328f9d1ba0bf...cd1ae6b9d26a

1 0

[galaxyproject/galaxy] 142ba8: Fix tour URLs in welcome
by GitHub 06 Dec '16

06 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 142ba89a990328548ecbafb5af06ba6799950cd8 https://github.com/galaxyproject/galaxy/commit/142ba89a990328548ecbafb5af06… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M static/welcome.html.sample Log Message: ----------- Fix tour URLs in welcome Commit: 328f9d1ba0bf60ca8e6be706327a3ad3b0c6e656 https://github.com/galaxyproject/galaxy/commit/328f9d1ba0bf60ca8e6be706327a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M static/welcome.html.sample Log Message: ----------- Merge pull request #3274 from dannon/fix_tour_welcome Fix tour URLs in welcome Compare: https://github.com/galaxyproject/galaxy/compare/ab52cc46ed93...328f9d1ba0bf

1 0

[galaxyproject/galaxy] 7fa10a: Simplify dependency list for cached environemnts (...
by GitHub 06 Dec '16

06 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7fa10aa907ad6527f9e71a4d661281d21ac9150c https://github.com/galaxyproject/galaxy/commit/7fa10aa907ad6527f9e71a4d6612… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Simplify dependency list for cached environemnts (many thanks @nsoranzo) Commit: d0ad2ae1ce296e41e88264b0a770bf9c176db814 https://github.com/galaxyproject/galaxy/commit/d0ad2ae1ce296e41e88264b0a770… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Merge pull request #3272 from mvdbeek/fix_superfluous_brackets [16.10] Simplify dependency list for cached environemnts (many thanks @nsoranzo) Commit: ab52cc46ed9365eab85881abfcb196b1e2fca63d https://github.com/galaxyproject/galaxy/commit/ab52cc46ed9365eab85881abfcb1… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Merge branch 'release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/5b1b191f2ee5...ab52cc46ed93

1 0

[galaxyproject/galaxy] 7fa10a: Simplify dependency list for cached environemnts (...
by GitHub 06 Dec '16

06 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: 7fa10aa907ad6527f9e71a4d661281d21ac9150c https://github.com/galaxyproject/galaxy/commit/7fa10aa907ad6527f9e71a4d6612… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Simplify dependency list for cached environemnts (many thanks @nsoranzo) Commit: d0ad2ae1ce296e41e88264b0a770bf9c176db814 https://github.com/galaxyproject/galaxy/commit/d0ad2ae1ce296e41e88264b0a770… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Merge pull request #3272 from mvdbeek/fix_superfluous_brackets [16.10] Simplify dependency list for cached environemnts (many thanks @nsoranzo) Compare: https://github.com/galaxyproject/galaxy/compare/622f2997376b...d0ad2ae1ce29

1 0

[galaxyproject/galaxy] bab709: Request information about tool dependencies from t...
by GitHub 05 Dec '16

05 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bab709c755ef2ba83849c9457f9558d79a11eaf3 https://github.com/galaxyproject/galaxy/commit/bab709c755ef2ba83849c9457f95… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Request information about tool dependencies from toolshed and make available in prepare_for_install Commit: 72f417ef977030ce092219b7565f2cb6650e5a2c https://github.com/galaxyproject/galaxy/commit/72f417ef977030ce092219b7565f… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Display requirement status on TS install This commit displays tool requirements as defined in the tool xml during the install confirmation dialog. If a tool dependency is defined in the tool XML, but not in a tool_dependencies.xml, a warning is shown if conda is not activated. This should close #3257. Commit: f20c478bd963c9eb907b711af659f17ef47c171f https://github.com/galaxyproject/galaxy/commit/f20c478bd963c9eb907b711af659… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Use Tool Shed instead of toolshed Commit: 622f2997376bceb30b822f6c5f1b3a0096e5e2f9 https://github.com/galaxyproject/galaxy/commit/622f2997376bceb30b822f6c5f1b… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Merge pull request #3262 from mvdbeek/conda_only_improvements [16.10] Display tool requirements for conda-only tools Commit: 5b1b191f2ee555be0247310e1a6c303d783d9ffa https://github.com/galaxyproject/galaxy/commit/5b1b191f2ee555be0247310e1a6c… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Merge branch 'release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/982a35df087a...5b1b191f2ee5

1 0

[galaxyproject/galaxy] bab709: Request information about tool dependencies from t...
by GitHub 05 Dec '16

05 Dec '16

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: bab709c755ef2ba83849c9457f9558d79a11eaf3 https://github.com/galaxyproject/galaxy/commit/bab709c755ef2ba83849c9457f95… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py Log Message: ----------- Request information about tool dependencies from toolshed and make available in prepare_for_install Commit: 72f417ef977030ce092219b7565f2cb6650e5a2c https://github.com/galaxyproject/galaxy/commit/72f417ef977030ce092219b7565f… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Display requirement status on TS install This commit displays tool requirements as defined in the tool xml during the install confirmation dialog. If a tool dependency is defined in the tool XML, but not in a tool_dependencies.xml, a warning is shown if conda is not activated. This should close #3257. Commit: f20c478bd963c9eb907b711af659f17ef47c171f https://github.com/galaxyproject/galaxy/commit/f20c478bd963c9eb907b711af659… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M templates/admin/tool_shed_repository/select_tool_panel_section.mako Log Message: ----------- Use Tool Shed instead of toolshed Commit: 622f2997376bceb30b822f6c5f1b3a0096e5e2f9 https://github.com/galaxyproject/galaxy/commit/622f2997376bceb30b822f6c5f1b… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/util/shed_util_common.py M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/webapps/tool_shed/repository/common.mako Log Message: ----------- Merge pull request #3262 from mvdbeek/conda_only_improvements [16.10] Display tool requirements for conda-only tools Compare: https://github.com/galaxyproject/galaxy/compare/888a8f91537e...622f2997376b

1 0

[galaxyproject/usegalaxy-playbook] 6a1d1a: comment out 2 gff filters, update subrepo
by GitHub 05 Dec '16

05 Dec '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 6a1d1adfd0ea935e555faa69a428c34055b3115b https://github.com/galaxyproject/usegalaxy-playbook/commit/6a1d1adfd0ea935e… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-05 (Mon, 05 Dec 2016) Changed paths: M common_roles M files/galaxy/usegalaxy.org/config/tool_conf.xml Log Message: ----------- comment out 2 gff filters, update subrepo

1 0

[galaxyproject/galaxy] b42527: Estimate the walltime usage over the last 30 days.
by GitHub 03 Dec '16

03 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b4252724e5e5dc0088828778d36ae767f3608f23 https://github.com/galaxyproject/galaxy/commit/b4252724e5e5dc0088828778d36a… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M lib/galaxy/jobs/handler.py Log Message: ----------- Estimate the walltime usage over the last 30 days. Log at debug level if usage is over 20 seconds. Commit: a680d90d54c39236bedd0e8fe4fe20568aa81372 https://github.com/galaxyproject/galaxy/commit/a680d90d54c39236bedd0e8fe4fe… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M config/galaxy.ini.sample M lib/galaxy/actions/admin.py M lib/galaxy/config.py M lib/galaxy/datatypes/images.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/runners/util/cli/job/slurm_torque.py M lib/galaxy/jobs/splitters/basic.py M lib/galaxy/objectstore/pulsar.py M lib/galaxy/quota/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/data_manager.py M lib/galaxy/tools/actions/data_source.py M lib/galaxy/tools/actions/history_imp_exp.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/actions/upload.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/requirements.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/lint.py M lib/galaxy/tools/parameters/input_translation.py M lib/galaxy/tools/parameters/sanitize.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/test.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/aliaspickler.py M lib/galaxy/util/dbkeys.py M lib/galaxy/web/framework/middleware/statsd.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/search.py M lib/galaxy/webapps/tool_shed/controllers/groups.py M lib/galaxy/webapps/tool_shed/framework/middleware/remoteuser.py M lib/galaxy/webapps/tool_shed/util/ratings_util.py M lib/galaxy/workflow/steps.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/env_file_builder.py M lib/tool_shed/repository_types/unrestricted.py M lib/tool_shed/util/web_util.py M scripts/api/example_watch_folder.py M scripts/api/form_create_from_xml.py M scripts/api/history_create_history.py M scripts/api/history_delete_history.py M scripts/api/import_library_dataset_to_history.py M scripts/api/import_workflows_from_installed_tool_shed_repository.py M scripts/api/library_create_folder.py M scripts/api/library_create_library.py M scripts/api/library_upload_from_import_dir.py M scripts/api/load_data_with_metadata.py M scripts/api/repair_tool_shed_repository.py M scripts/api/request_type_create_from_xml.py M scripts/api/requests_update_state.py M scripts/api/sample_dataset_update_status.py M scripts/api/sample_update_state.py M scripts/api/sequencer_configuration_create.py M scripts/api/upload_to_history.py M scripts/api/workflow_delete.py M scripts/api/workflow_execute.py M scripts/api/workflow_execute_parameters.py M scripts/api/workflow_import.py M scripts/api/workflow_import_from_file_rpark.py M scripts/build_toolbox.py M scripts/check_galaxy.py M scripts/check_python.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/cleanup_datasets/populate_uuid.py M scripts/cleanup_datasets/remove_renamed_datasets_from_disk.py M scripts/cleanup_datasets/rename_purged_datasets.py M scripts/cleanup_datasets/update_dataset_size.py M scripts/cleanup_datasets/update_metadata.py M scripts/drmaa_external_runner.py M static/maps/layout/menu.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/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/menu.js M test/api/test_datasets.py M test/api/test_history_contents_provenance.py M test/unit/test_sockets.py M tools/data_source/fetch.py Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into dev Commit: 2408502c2d316869df0f84b65e50db3114f9529a https://github.com/galaxyproject/galaxy/commit/2408502c2d316869df0f84b65e50… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/__init__.py M test/unit/jobs/test_job_configuration.py Log Message: ----------- Add total_walltime limit type Add to sample config, config reader and unittest Commit: 8e4072179789517427727339e3e9a2e911fae6a6 https://github.com/galaxyproject/galaxy/commit/8e4072179789517427727339e3e9… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M lib/galaxy/jobs/handler.py Log Message: ----------- Use conf for walltime limit and window. Pause job if necessary Commit: 3d4de14840847636ad81c36bd64449fb959220b9 https://github.com/galaxyproject/galaxy/commit/3d4de14840847636ad81c36bd644… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/handler.py Log Message: ----------- Comply with galaxy style guide regarding whitespace. Commit: db1b51a0802e392787c3a71e7a8bd202b568bf3a https://github.com/galaxyproject/galaxy/commit/db1b51a0802e392787c3a71e7a8b… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M config/job_conf.xml.sample_advanced Log Message: ----------- Fix errors in documentation for total_walltime limit Commit: 91e65aa42c8e2439883da1d690e770a5a9df1a79 https://github.com/galaxyproject/galaxy/commit/91e65aa42c8e2439883da1d690e7… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M lib/galaxy/jobs/handler.py Log Message: ----------- Move datetime import to the top of the file. Commit: f467bcb70697bdaac0f94f187970b98f9b58bfe9 https://github.com/galaxyproject/galaxy/commit/f467bcb70697bdaac0f94f187970… Author: Maximilian Friedersdorff <max(a)friedersdorff.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M lib/galaxy/jobs/__init__.py Log Message: ----------- Add total_walltime to legacy job conf Commit: 982a35df087a2cd51eef97bef978144ee5bdb863 https://github.com/galaxyproject/galaxy/commit/982a35df087a2cd51eef97bef978… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/handler.py M test/unit/jobs/test_job_configuration.py Log Message: ----------- Merge pull request #3217 from interactomix/dev Per user total walltime limit. Compare: https://github.com/galaxyproject/galaxy/compare/2f9862f3c33c...982a35df087a

1 0

[galaxyproject/galaxy] d0c39d: Sort environment variables in job info page
by GitHub 03 Dec '16

03 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d0c39d6e96bd182852e461761a99e0029c282205 https://github.com/galaxyproject/galaxy/commit/d0c39d6e96bd182852e461761a99… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-12-02 (Fri, 02 Dec 2016) Changed paths: M templates/show_params.mako Log Message: ----------- Sort environment variables in job info page Commit: 2f9862f3c33c01af244b20173b1106a2ec26d3db https://github.com/galaxyproject/galaxy/commit/2f9862f3c33c01af244b20173b11… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-02 (Fri, 02 Dec 2016) Changed paths: M templates/show_params.mako Log Message: ----------- Merge pull request #3256 from erasche/sort-env-vars Sort environment variables in job info page Compare: https://github.com/galaxyproject/galaxy/compare/f52f44230d85...2f9862f3c33c

1 0

[galaxyproject/galaxy] 16b027: Configure a test Galaxy as needed for functional t...
by GitHub 03 Dec '16

03 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 16b027e12509356a53a4fd1268855d913e5438f3 https://github.com/galaxyproject/galaxy/commit/16b027e12509356a53a4fd126885… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M test/base/driver_util.py M test/base/twilltestcase.py Log Message: ----------- Configure a test Galaxy as needed for functional test cases. ./run_tests.sh is still good for launching one Galaxy for a bunch of different test cases - but now you can do really simple things like: ``` $ nosetests test/api/test_tours.py ``` In this scenario, the test case class will check if run_tests.sh has created a test driver to use and if it hasn't - one will be made just for the test case (like the new integration tests). Commit: b6ee471f35fc3d821d07fe406aa759731704eda4 https://github.com/galaxyproject/galaxy/commit/b6ee471f35fc3d821d07fe406aa7… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M test/base/driver_util.py Log Message: ----------- Allow test data resolver to work with GALAXY_TEST_EXTERNAL. Commit: 82728df1555141be4fa3e7be16e151124b1dfc89 https://github.com/galaxyproject/galaxy/commit/82728df1555141be4fa3e7be16e1… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M run_tests.sh A scripts/dump_tour.py M scripts/functional_tests.py M templates/webapps/galaxy/workflow/list.mako M test/base/driver_util.py R test/casperjs/anon-history-tests.js R test/casperjs/hda-state-tests.js R test/casperjs/history-options-tests.js R test/casperjs/history-panel-tests.js R test/casperjs/history-share-tests.js R test/casperjs/login-tests.js R test/casperjs/registration-tests.js R test/casperjs/upload-tests.js A test/functional/tools/for_tours/filtering.py A test/functional/tools/for_tours/filtering.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml A test/galaxy_selenium/__init__.py A test/galaxy_selenium/cli.py A test/galaxy_selenium/data.py A test/galaxy_selenium/driver_factory.py A test/galaxy_selenium/has_driver.py A test/galaxy_selenium/navigates_galaxy.py A test/galaxy_selenium/navigation-data.yml A test/galaxy_selenium/sizzle.py A test/selenium_tests/__init__.py A test/selenium_tests/framework.py A test/selenium_tests/test_anon_history.py A test/selenium_tests/test_history_dataset_state.py A test/selenium_tests/test_history_options.py A test/selenium_tests/test_history_panel.py A test/selenium_tests/test_history_sharing.py A test/selenium_tests/test_login.py A test/selenium_tests/test_registration.py A test/selenium_tests/test_stock_tours.py A test/selenium_tests/test_uploads.py A test/selenium_tests/test_workflow_editor.py Log Message: ----------- Replace CasperJS browser tests with Selenium tests. See documentation added to run_tests.sh. This can be configured to target local web browsers or Selenium remote services as detailed in that script. Individual tests can be executed with nosetests directly or groups of tests can share a common test Galaxy spin up when using ./run_tests.sh. If GALAXY_TEST_EXTERNAL=<url> is set - it will be respected and Galaxy will not be spun up (remember the URL needs to be reachable from the Selenium server inside the Docker container). Every test failure writes a current screenshot of Galaxy to database/test_errors. I will be honest that the desire to move toward selenium is based solely on failing to get the Casper tests to pass consistently due to bugs causing segfaults in the underlying tools (probably casperjs or phantomjs?). Over the past year I have tried multiple versions of dependencies, etc... and it never works out for me. Likewise Martin has never been able to get the tests to run consistently under Jenkins. I don't think Python or JavaScript is inherently better, this wasn't based on a personal preference about what kind of test I want to write. Despite this being the primary reason, there are clear benefits to Selenium. It tests the actual web browsers we support, generates screenshots, has better documented and more robust tooling, can scale across clusters. Less clear, but certainly still a benefit of being Python based is that it fits with the rest of the test framework more cleanly than CasperJS. Finally Carl's last words on CasperJS were "Ditch it". The following specific tests were added or replaced: - Implemented tour testing via Selenium (walk the two working stock tours and verify elements avaiable and clicks are valid). This is how I discovered #3206. - Added completely new workflow GUI test (basic creation from URL and in editor). - Replaced broken CasperJS registeration tests (text and expectations now wrong) with a Selenium variant that works against dev. - Replaced broken anonymous history CasperJS tests with working Selenium tests. - Replaced broken upload CasperJS tests with working Selenium tests. - Replaced history options CasperJS tests with Selenium tests. - Replaced login CasperJS tests with Selenium tests. - Replaced history-share-tests.js with test_history_options.py - Replaced history-panel-tests.js with test_history_panel.py - Replaced a big part of hda-state-tests.js with test_history_dataset_state.py I'm confident these utilities represent a sharable and higher-level abstraction around functional testing of Galaxy that can be used outside of Galaxy's testing framework. So a subset of the functional test stuff is in a separate module with minimal dependencies that I intend to make stand alone and pip installable like galaxy-lib. This module consists of: - Sizzle stuff in its own package. This code allows Selenium to reason with jQuery selectors instead of vanilla CSS selectors. - Functionality for creating a Selenium driver and virtual display. - The ``HasDriver`` mixin - this provides higher level navigation utilities not specifically tied to Galaxy. - A package with abstractions for navigating Galaxy. This provides a higher-level interfactor for things such as logging in and out, registering a user, navigating menus, fetching Galaxy style tooltips and error messages, and walking Galaxy tours. In order to demonstrate this new module is useful outside of Galaxy tests - I've included a CLI package to ease building argparse utilities around these abstractions and implemented a simple demonstration script that walks a Galaxy tour and dumps screenshots of Galaxy at each step to a folder. This is more of a demonstration of the utilities than an actual polished end user tool - though it might be helpful in linting and debugging tours. In the future I hope to extend this scripting to implement - Periodic deployment testing to ensure things like Jupyter work in production. - A best practice recipe for Galaxy QA testing by deployers. - An utility to generate dozens of screenshots of various aspects of Galaxy so we can quickly visually inspect ever part of the GUI before big releases. xref https://github.com/galaxyproject/starforge/pull/115 xref #1419 Commit: 9b0390defb6832cb6ce56899b6962cd92dac9aee https://github.com/galaxyproject/galaxy/commit/9b0390defb6832cb6ce56899b696… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M test/api/test_api_batch.py R test/casperjs/api-batch-tests.js Log Message: ----------- Remove CasperJS api-batch-tests.js - already available in API test framework. Commit: 5cd2c551043d383aa93452c8bd68bf1ded0def1e https://github.com/galaxyproject/galaxy/commit/5cd2c551043d383aa93452c8bd68… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: R test/casperjs/api-tool-tests.js R test/casperjs/api-user-tests.js Log Message: ----------- Remove CasperJS API user and history tests... ... more complete testing for both is available in API tests. Commit: bf896d621d860f3c93d2276bc02350a2b92b6052 https://github.com/galaxyproject/galaxy/commit/bf896d621d860f3c93d2276bc023… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M test/api/test_histories.py R test/casperjs/api-history-tests.js Log Message: ----------- Move CasperJS history API tests in api/test_histories.py. Commit: 74c4ac3662257776a08bc724a2919547856da819 https://github.com/galaxyproject/galaxy/commit/74c4ac3662257776a08bc724a291… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: A .ci/jenkins/api/run_tests.sh A .ci/jenkins/framework/run_tests.sh A .ci/jenkins/integration/run_tests.sh A .ci/jenkins/selenium/Dockerfile A .ci/jenkins/selenium/docker-compose.yml A .ci/jenkins/selenium/galaxy.ini A .ci/jenkins/selenium/run_galaxy.bash A .ci/jenkins/selenium/run_tests.sh A .ci/jenkins/toolshed/run_tests.sh M run_tests.sh Log Message: ----------- Create simple scripts for all Jenkins tests. Makes it easier to run exact tests (or subset of tests) from Jenkins locally. Selenium script is particularily interesting because it represents a very simple entry point into selenium testing. Commit: 53b6413df9194da6845b8f4eece2464ef2b1100c https://github.com/galaxyproject/galaxy/commit/53b6413df9194da6845b8f4eece2… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M test/selenium_tests/framework.py Log Message: ----------- Attempt fix of logic for GALAXY_TEST_SELENIUM_HEADLESS == "auto". Pointed out by @dannon. Commit: fa3d2063c4df595e5d0bfd47d7bf30b8b3a567eb https://github.com/galaxyproject/galaxy/commit/fa3d2063c4df595e5d0bfd47d7bf… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M .ci/jenkins/selenium/run_tests.sh Log Message: ----------- Update selenium test's use of docker-compose to prevent interference across builds. Commit: e731b6f5983a16fdfb1d6418ac5c89a61da77714 https://github.com/galaxyproject/galaxy/commit/e731b6f5983a16fdfb1d6418ac5c… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M .ci/jenkins/selenium/run_tests.sh Log Message: ----------- Fix and enhance Jenkins test for Selenium. - If condition on fa3d2063c4df595e5d0bfd47d7bf30b8b3a567eb was exactly wrong. - Check for docker-compose services up before and during polling to wait for Galaxy - if Galaxy isn't going to work just die. - Improved logging. Commit: 495ab5992701a64e5cef9997180b75123cd74fd8 https://github.com/galaxyproject/galaxy/commit/495ab5992701a64e5cef9997180b… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M .ci/jenkins/selenium/run_tests.sh Log Message: ----------- Another fix for Selenium Jenkins. docker-compose strips out dashes and underscores in the project name when creating containers. Commit: 45edf1bb41fd29abb7b4258942e77a4503c49d6f https://github.com/galaxyproject/galaxy/commit/45edf1bb41fd29abb7b4258942e7… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M test/functional/tools/sample_datatypes_conf.xml Log Message: ----------- Add bed datatype to framework tests because Filter1 now a framework test tool. Commit: 80e64b8cc0dd8f469a6807368339b9a245515006 https://github.com/galaxyproject/galaxy/commit/80e64b8cc0dd8f469a6807368339… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M scripts/dump_tour.py Log Message: ----------- PEP-8 fix as pointed out by @nsoranzo. Commit: f52f44230d859e7f3b576710b7c0120e86b66934 https://github.com/galaxyproject/galaxy/commit/f52f44230d859e7f3b576710b7c0… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-12-02 (Fri, 02 Dec 2016) Changed paths: A .ci/jenkins/api/run_tests.sh A .ci/jenkins/framework/run_tests.sh A .ci/jenkins/integration/run_tests.sh A .ci/jenkins/selenium/Dockerfile A .ci/jenkins/selenium/docker-compose.yml A .ci/jenkins/selenium/galaxy.ini A .ci/jenkins/selenium/run_galaxy.bash A .ci/jenkins/selenium/run_tests.sh A .ci/jenkins/toolshed/run_tests.sh M lib/galaxy/dependencies/dev-requirements.txt M run_tests.sh A scripts/dump_tour.py M scripts/functional_tests.py M templates/webapps/galaxy/workflow/list.mako M test/api/test_api_batch.py M test/api/test_histories.py M test/base/driver_util.py M test/base/twilltestcase.py R test/casperjs/anon-history-tests.js R test/casperjs/api-batch-tests.js R test/casperjs/api-history-tests.js R test/casperjs/api-tool-tests.js R test/casperjs/api-user-tests.js R test/casperjs/hda-state-tests.js R test/casperjs/history-options-tests.js R test/casperjs/history-panel-tests.js R test/casperjs/history-share-tests.js R test/casperjs/login-tests.js R test/casperjs/registration-tests.js R test/casperjs/upload-tests.js A test/functional/tools/for_tours/filtering.py A test/functional/tools/for_tours/filtering.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml A test/galaxy_selenium/__init__.py A test/galaxy_selenium/cli.py A test/galaxy_selenium/data.py A test/galaxy_selenium/driver_factory.py A test/galaxy_selenium/has_driver.py A test/galaxy_selenium/navigates_galaxy.py A test/galaxy_selenium/navigation-data.yml A test/galaxy_selenium/sizzle.py A test/selenium_tests/__init__.py A test/selenium_tests/framework.py A test/selenium_tests/test_anon_history.py A test/selenium_tests/test_history_dataset_state.py A test/selenium_tests/test_history_options.py A test/selenium_tests/test_history_panel.py A test/selenium_tests/test_history_sharing.py A test/selenium_tests/test_login.py A test/selenium_tests/test_registration.py A test/selenium_tests/test_stock_tours.py A test/selenium_tests/test_uploads.py A test/selenium_tests/test_workflow_editor.py Log Message: ----------- Merge pull request #3239 from jmchilton/more_selenium Replace CasperJS browser tests with Selenium tests. Compare: https://github.com/galaxyproject/galaxy/compare/3b84136d4f0a...f52f44230d85

1 0

[galaxyproject/galaxy] 72960d: adjust menu tooltips to be oneliners
by GitHub 01 Dec '16

01 Dec '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 72960de216cac3d37de168f4eb8bcc760dd68632 https://github.com/galaxyproject/galaxy/commit/72960de216cac3d37de168f4eb8b… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- adjust menu tooltips to be oneliners Commit: 710c2639f94faac0ef2f999456e183330e4efa54 https://github.com/galaxyproject/galaxy/commit/710c2639f94faac0ef2f999456e1… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/ui/ui-misc.js A client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/style/less/base.less M client/galaxy/style/less/ui.less M config/galaxy.ini.sample M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M lib/galaxy/auth/__init__.py M lib/galaxy/config.py M lib/galaxy/managers/configuration.py M lib/galaxy/managers/users.py M lib/galaxy/model/__init__.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/web/form_builder.py M lib/galaxy/webapps/galaxy/api/configuration.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/controllers/user.py M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/ui/ui-misc.js.map A static/maps/mvc/user/user-preferences.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/layout/page.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/ui/ui-misc.js A static/scripts/mvc/user/user-preferences.js M static/style/blue/base.css M templates/admin/tool_shed_repository/common.mako M templates/admin/tool_shed_repository/select_tool_panel_section.mako R templates/user/change_password.mako R templates/user/communication_settings.mako R templates/user/edit_address.mako R templates/user/new_address.mako R templates/user/permissions.mako M templates/user/register.mako R templates/user/toolbox_filters.mako R templates/user/username.mako R templates/webapps/galaxy/user/api_keys.mako R templates/webapps/galaxy/user/manage_info.mako A templates/webapps/tool_shed/user/api_keys.mako A templates/webapps/tool_shed/user/change_password.mako A templates/webapps/tool_shed/user/index.mako A templates/webapps/tool_shed/user/username.mako A test/api/test_configuration.py M test/api/test_users.py R test/casperjs/api-configuration-tests.js M test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py M test/shed_functional/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py Log Message: ----------- Merge branch 'dev' into adjust-menu-tooltips Conflicts: static/maps/layout/menu.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map static/scripts/layout/menu.js Commit: bf8cffa2b32fd2af33be60a802c2fc49c3d406f9 https://github.com/galaxyproject/galaxy/commit/bf8cffa2b32fd2af33be60a802c2… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- repack client Commit: 3b84136d4f0ad15d4965b1ca6baa19e6d51e22d4 https://github.com/galaxyproject/galaxy/commit/3b84136d4f0ad15d4965b1ca6baa… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- Merge pull request #3230 from martenson/adjust-menu-tooltips adjust menu tooltips to be oneliners Compare: https://github.com/galaxyproject/galaxy/compare/ead8e15f42a4...3b84136d4f0a

1 0

[galaxyproject/galaxy] 0c91f6: Change channel order in documentation
by GitHub 01 Dec '16

01 Dec '16

Branch: refs/heads/conda_channel Home: https://github.com/galaxyproject/galaxy Commit: 0c91f65a99c43608faaa9f7b504646a326d6adaa https://github.com/galaxyproject/galaxy/commit/0c91f65a99c43608faaa9f7b5046… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M doc/source/admin/dependency_resolvers.rst Log Message: ----------- Change channel order in documentation

1 0

[galaxyproject/galaxy] 1f221a: change channel order
by GitHub 01 Dec '16

01 Dec '16

Branch: refs/heads/conda_channel Home: https://github.com/galaxyproject/galaxy Commit: 1f221aab22f4840d18847859f5099d4dc721b864 https://github.com/galaxyproject/galaxy/commit/1f221aab22f4840d18847859f509… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- change channel order

1 0

[galaxyproject/galaxy] 8519e1: change conda channel order
by GitHub 01 Dec '16

01 Dec '16

Branch: refs/heads/conda_channel Home: https://github.com/galaxyproject/galaxy Commit: 8519e12a474ec5337036136e19c66ed9352ac91a https://github.com/galaxyproject/galaxy/commit/8519e12a474ec5337036136e19c6… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2016-12-01 (Thu, 01 Dec 2016) Changed paths: M config/galaxy.ini.sample Log Message: ----------- change conda channel order

1 0

[galaxyproject/usegalaxy-playbook] 68e7fb: Update and fix Jupyter on Test
by GitHub 30 Nov '16

30 Nov '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 68e7fbd23245e21504db78c8c0ff65c2cd894669 https://github.com/galaxyproject/usegalaxy-playbook/commit/68e7fbd23245e215… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M roles/galaxyprojectdotorg.interactive_environments/meta/.galaxy_install_info M roles/galaxyprojectdotorg.interactive_environments/templates/jupyter_apache.conf.j2 M roles/galaxyprojectdotorg.interactive_environments/templates/jupyter_nginx.conf.j2 M stage/galaxy_version.yml M stage/group_vars/galaxyservers.yml Log Message: ----------- Update and fix Jupyter on Test Commit: db0307a737b35926bded36bd2c991c4b54d32f04 https://github.com/galaxyproject/usegalaxy-playbook/commit/db0307a737b35926… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M production/group_vars/galaxywebservers.yml Log Message: ----------- Limit docker memory Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/bd4f3a0eca9b...…

1 0

[galaxyproject/galaxy] 4398ab: Check also for cgroup memory warnings if job was c...
by GitHub 30 Nov '16

30 Nov '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4398abd1d370a20bf420772d2eda5b9b7e89a26d https://github.com/galaxyproject/galaxy/commit/4398abd1d370a20bf420772d2eda… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Check also for cgroup memory warnings if job was cancelled Commit: e1276175b16d7a60e4eefab659a1173383a47d06 https://github.com/galaxyproject/galaxy/commit/e1276175b16d7a60e4eefab659a1… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Handle also COMPLETED state in _complete_terminal_job Commit: af58f82083b1c9e38453364b58ae6e21c92502f8 https://github.com/galaxyproject/galaxy/commit/af58f82083b1c9e38453364b58ae… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Fix _get_slurm_state_with_sacct() for not completed jobs Commit: cc9b741a1dffaa20121f24fcb05cdd63fbb2b8b2 https://github.com/galaxyproject/galaxy/commit/cc9b741a1dffaa20121f24fcb05c… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Log when slurm_state is 'COMPLETED' Commit: ead8e15f42a4d74cbbd23dd50380a2facb285714 https://github.com/galaxyproject/galaxy/commit/ead8e15f42a4d74cbbd23dd50380… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-11-30 (Wed, 30 Nov 2016) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge pull request #3218 from nsoranzo/slurm_fixes 3 enhancements for the SLURM job runner Compare: https://github.com/galaxyproject/galaxy/compare/2d510fae981f...ead8e15f42a4

1 0