January 2017 - galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] 79752b: Do not allow recursive replacements in PJA.
by GitHub 10 Jan '17

10 Jan '17

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: 79752b5b4a0e80a6cd4b02aed8cfd93d8d61208a https://github.com/galaxyproject/galaxy/commit/79752b5b4a0e80a6cd4b02aed8cf… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-10 (Tue, 10 Jan 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Do not allow recursive replacements in PJA. May result in infinite loops in workflow scheduling threads. Commit: 24b250ab3369489b91361c22bdf51b1729861e85 https://github.com/galaxyproject/galaxy/commit/24b250ab3369489b91361c22bdf5… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2017-01-10 (Tue, 10 Jan 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Merge pull request #3397 from jmchilton/backport_3395 [16.10] Backport #3395 Compare: https://github.com/galaxyproject/galaxy/compare/63e70f4f2f47...24b250ab3369

1 0

[galaxyproject/galaxy] caf9bf: Refactor DependencyManager to walk dependencies re...
by GitHub 10 Jan '17

10 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: caf9bf21de894312a3a3d164ae4ac3be37e487e1 https://github.com/galaxyproject/galaxy/commit/caf9bf21de894312a3a3d164ae4a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Refactor DependencyManager to walk dependencies resolvers first, then requirements. Invert previous loop to give resolvers a chance to resolve everything at once in subsequent commits. Commit: 0a280e7d48c64d0a9daed6514eafe0314a6aa940 https://github.com/galaxyproject/galaxy/commit/0a280e7d48c64d0a9daed6514eaf… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Give dependency resolvers a shot at resolving all dependencies at once. Commit: c2ac19275064b4c5b07685133f28bb509fd6be7d https://github.com/galaxyproject/galaxy/commit/c2ac19275064b4c5b07685133f28… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py A test/functional/tools/mulled_example_conflict.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Implement resolve_all on Conda dependency resolver. This is a somewhat substantial reversal in the typical way that the Conda resolver works. Everything related to caching, copying, linking, and building environments on the fly should now only apply if both of the following conditions are met (1) there is more than one requirement tag in a tool and (2) not all of them are resolvable exactly by the Conda resolver. For recipes that don't meet both of these two criteria - the normal case I would suspect going forward - Galaxy will just look for a hashed environment for these requirements built for all the requirements at once whenever the requirements are installed. The new 90% case, such environments should be much less buggy for two primary reasons. - #3299 is solved - in other words Conda is deferred to and if packages have potential conflicts - Conda can choose the right combination of build specifiers to resolve things correctly. - Environments are no longer built on a per-job basis - this means file system problems related to linking and copying aren't really an issue and complexity related to caching can be safely ignored. My guess is we should re-write all the Conda docs to make the other use case seem like a corner case - because hopefully it is now. This commit includes a test tool that wouldn't work without the rewrite I believe. Commit: 0e509a98ed79daf250fdd486f827d14335e88486 https://github.com/galaxyproject/galaxy/commit/0e509a98ed79daf250fdd486f827… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Create merged environments at install time Currently tested with UI only Commit: ad92bbf9bebafed22395e0199efd35a838ac1f4a https://github.com/galaxyproject/galaxy/commit/ad92bbf9bebafed22395e0199efd… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Restore the cached environments for now ... better to completely eliminate them later Commit: fd8243b3d3a6ac0fcaea5f7ccfd7d5ec472b083b https://github.com/galaxyproject/galaxy/commit/fd8243b3d3a6ac0fcaea5f7ccfd7… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Merge pull request #52 from mvdbeek/install_time_improvements Create merged environments at install time Commit: 48a22d6e53c08de37a8a39cc5bb0228789a19033 https://github.com/galaxyproject/galaxy/commit/48a22d6e53c08de37a8a39cc5bb0… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Revert "Restore the cached environments for now ... better to completely eliminate them later" This reverts commit ad92bbf9bebafed22395e0199efd35a838ac1f4a. Commit: 50bee381d35b97c951982ddbed442f8068574a46 https://github.com/galaxyproject/galaxy/commit/50bee381d35b97c951982ddbed44… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Revert "Create merged environments at install time" This reverts commit 0e509a98ed79daf250fdd486f827d14335e88486. Commit: eea89de19adffe3a18f562cac7c97087e8a2e604 https://github.com/galaxyproject/galaxy/commit/eea89de19adffe3a18f562cac7c9… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Use resolver to explicitly install dependencies This avoids replicating the resolver logic when installing dependencies and should be better than https://github.com/jmchilton/galaxy/pull/52 Commit: 5c325236189ce17344ffedc1d821e94c6fb33483 https://github.com/galaxyproject/galaxy/commit/5c325236189ce17344ffedc1d821… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py Log Message: ----------- Merge pull request #53 from mvdbeek/install_time_2 Install time 2 Commit: 542dc4077f35d3760d3a8b51716acffce2574bef https://github.com/galaxyproject/galaxy/commit/542dc4077f35d3760d3a8b51716a… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-10 (Tue, 10 Jan 2017) Changed paths: M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/tool_shed/galaxy_install/install_manager.py A test/functional/tools/mulled_example_conflict.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3391 from jmchilton/resolve_all_at_once Resolve Conda Dependencies All at Once Compare: https://github.com/galaxyproject/galaxy/compare/1082385b0b8b...542dc4077f35

1 0

[galaxyproject/galaxy] d1cf0d: Do not allow recursive replacements in PJA.
by GitHub 09 Jan '17

09 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d1cf0def31b9060f5fe4b4f116ae8a8f47d0633e https://github.com/galaxyproject/galaxy/commit/d1cf0def31b9060f5fe4b4f116ae… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M lib/galaxy/jobs/actions/post.py Log Message: ----------- Do not allow recursive replacements in PJA. May result in infinite loops in workflow scheduling threads. Commit: d1eeafcc8f647fda2362b20c8625224b49520493 https://github.com/galaxyproject/galaxy/commit/d1eeafcc8f647fda2362b20c8625… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M test/api/test_workflows.py Log Message: ----------- Test case d1cf0def31b9060f5fe4b4f116ae8a8f47d0633e. Commit: 1082385b0b8b343482d7c06056473cf80b568779 https://github.com/galaxyproject/galaxy/commit/1082385b0b8b343482d7c0605647… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M lib/galaxy/jobs/actions/post.py M test/api/test_workflows.py Log Message: ----------- Merge pull request #3395 from jmchilton/pja_infinite_loop Do not allow recursive replacements in PJA renames. Compare: https://github.com/galaxyproject/galaxy/compare/f358d14670cc...1082385b0b8b

1 0

[galaxyproject/galaxy] 5f0a41: Add diamond database
by GitHub 09 Jan '17

09 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 5f0a4131dfdba219a0298f1ad3f8e7270b499a17 https://github.com/galaxyproject/galaxy/commit/5f0a4131dfdba219a0298f1ad3f8… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-01 (Sun, 01 Jan 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Add diamond database Commit: 0518cbf02e5541514dbbca6178213dcc046b7bc4 https://github.com/galaxyproject/galaxy/commit/0518cbf02e5541514dbbca617821… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-05 (Thu, 05 Jan 2017) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Add sniffer for dmnd extension Commit: 87000dca9ef49d7d6e068cf50313dec43dd10a3c https://github.com/galaxyproject/galaxy/commit/87000dca9ef49d7d6e068cf50313… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-05 (Thu, 05 Jan 2017) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- Add dmnd class Commit: 8cfbfcdaff4cfdeefe4e11733ac1530eebb80da2 https://github.com/galaxyproject/galaxy/commit/8cfbfcdaff4cfdeefe4e11733ac1… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-05 (Thu, 05 Jan 2017) Changed paths: M lib/galaxy/datatypes/sniff.py Log Message: ----------- Add test to dmnd Commit: 275f2fb84beffb89c7a8a22d14a176455d9bf328 https://github.com/galaxyproject/galaxy/commit/275f2fb84beffb89c7a8a22d14a1… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-05 (Thu, 05 Jan 2017) Changed paths: M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/diamond_db.dmnd Log Message: ----------- Add test data for diamond datatype Commit: 34471bbc47b5bd428099c8f5518c0329b3c86582 https://github.com/galaxyproject/galaxy/commit/34471bbc47b5bd428099c8f5518c… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-05 (Thu, 05 Jan 2017) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- Correct the header Commit: 5dcb2f317bc3a3f07e30e1fce070ed012f0e7379 https://github.com/galaxyproject/galaxy/commit/5dcb2f317bc3a3f07e30e1fce070… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- Change the header to find for dmnd Commit: 50f9f74884068690f7c5e125b4aae10fd48bf41e https://github.com/galaxyproject/galaxy/commit/50f9f74884068690f7c5e125b4aa… Author: Bérénice Batut <bebatut(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- Add extra line to fix flake8 Commit: f50272be0dee7d63ba452bc033ce6b5970a27e4a https://github.com/galaxyproject/galaxy/commit/f50272be0dee7d63ba452bc033ce… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/diamond_db.dmnd Log Message: ----------- Merge pull request #33 from ASaiM/dmnddb Add sniffer for dmnd files Commit: f358d14670cc0e4974bfdda1db96d5c63e553ee0 https://github.com/galaxyproject/galaxy/commit/f358d14670cc0e4974bfdda1db96… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/diamond_db.dmnd Log Message: ----------- Merge pull request #3379 from bgruening/dmnddb Add diamond database as datatype Compare: https://github.com/galaxyproject/galaxy/compare/dd9aa82db691...f358d14670cc

1 0

[galaxyproject/galaxy] b6e9f4: Fix workflow extraction of dataset/collections nam...
by GitHub 09 Jan '17

09 Jan '17

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: b6e9f4a6eefb53d2f3b8b415b80e1a674bd7cc8d https://github.com/galaxyproject/galaxy/commit/b6e9f4a6eefb53d2f3b8b415b80e… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- Fix workflow extraction of dataset/collections name. It works fine if multiple names are chosen, but if only one input is selected and named it doesn't work. This is a temporary workaround until that page is replaced by API calls with superior typing. Fixes #3247 reported by @peterjc. Commit: 63e70f4f2f47f5b952bb7817e93b0e61c8614dd7 https://github.com/galaxyproject/galaxy/commit/63e70f4f2f47f5b952bb7817e93b… Author: Aysam Guerler <aysam.guerler(a)gmail.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- Merge pull request #3376 from jmchilton/fix_3247 [16.10] Fix workflow extraction of dataset/collections name. Compare: https://github.com/galaxyproject/galaxy/compare/41f5ff48ed84...63e70f4f2f47

1 0

[galaxyproject/galaxy] d3291c: fix PHD Comics plugin
by GitHub 08 Jan '17

08 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d3291c15f96c05d17900606ca670acc4f9c90391 https://github.com/galaxyproject/galaxy/commit/d3291c15f96c05d17900606ca670… Author: Evgeny Anatskiy <evgeny.anatskiy(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M config/plugins/webhooks/demo/phdcomics/helper/__init__.py M config/plugins/webhooks/demo/phdcomics/static/script.js Log Message: ----------- fix PHD Comics plugin Commit: dd9aa82db69167e26b31d4f12da851c95ff2ee64 https://github.com/galaxyproject/galaxy/commit/dd9aa82db69167e26b31d4f12da8… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M config/plugins/webhooks/demo/phdcomics/helper/__init__.py M config/plugins/webhooks/demo/phdcomics/static/script.js Log Message: ----------- Merge pull request #3392 from anatskiy/phdcomics_fix Fix PHD Comics plugin Compare: https://github.com/galaxyproject/galaxy/compare/64faeece93c1...dd9aa82db691

1 0

[galaxyproject/galaxy] 433b99: Slim down testing ``Dockerfile``.
by GitHub 08 Jan '17

08 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 433b993ecae7d306d4222ca5d91a4a31cd907e52 https://github.com/galaxyproject/galaxy/commit/433b993ecae7d306d4222ca5d91a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M test/docker/base/Dockerfile M test/docker/base/ansible_vars.yml M test/docker/base/run_test_wrapper.sh Log Message: ----------- Slim down testing ``Dockerfile``. - Remove broken CasperJS from testing Dockerfile. - Remove multi-process mode. Multi-process mode was difficult to maintain and the last time I did testing at scale I found docker-galaxy-stable to be much more useful and easy to use. The test framework now supports GALAXY_TEST_EXTERNAL again so it should be easy enough to rig something up with docker-compose that actually uses a best practice container for scaling tests such as those in ``test/manual``. Commit: 64faeece93c1ecb59ff4d10b7664660e7886d419 https://github.com/galaxyproject/galaxy/commit/64faeece93c1ecb59ff4d10b7664… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M test/docker/base/Dockerfile M test/docker/base/ansible_vars.yml M test/docker/base/run_test_wrapper.sh Log Message: ----------- Merge pull request #3286 from jmchilton/slim_test_dockerfile Slim down testing ``Dockerfile``. Compare: https://github.com/galaxyproject/galaxy/compare/e1fbdc6808d3...64faeece93c1

1 0

[galaxyproject/galaxy] e260c8: Fix UX problem when sharing objects with users.
by GitHub 08 Jan '17

08 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e260c8eb05b7e7ca9d39d136041d84314f13d1d8 https://github.com/galaxyproject/galaxy/commit/e260c8eb05b7e7ca9d39d136041d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M templates/ind_share_base.mako Log Message: ----------- Fix UX problem when sharing objects with users. The problem is that by default Galaxy doesn't expose usernames and user e-mails via this form but a select2 + search is used anyway making it appear that any selection matches an actual user. It is confusing. Fixes #3250 reported by @peterjc. xref #1111 Commit: e1fbdc6808d3cf5b20870c07b39326bb13836ef1 https://github.com/galaxyproject/galaxy/commit/e1fbdc6808d3cf5b20870c07b393… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M templates/ind_share_base.mako Log Message: ----------- Merge pull request #3373 from jmchilton/remove_unused_select2 Fix UX problem when sharing objects with users. Compare: https://github.com/galaxyproject/galaxy/compare/dcf3b2175207...e1fbdc6808d3

1 0

[galaxyproject/galaxy] de35c8: Refactor API helpers for re-use in rest of test fr...
by GitHub 08 Jan '17

08 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: de35c85b655e7de0e5f349a2d61e4f11d73ef23e https://github.com/galaxyproject/galaxy/commit/de35c85b655e7de0e5f349a2d61e… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M .ci/flake8_lint_include_list.txt R test/api/helpers.py M test/api/test_dataset_collections.py M test/api/test_datasets.py M test/api/test_histories.py M test/api/test_history_contents.py M test/api/test_history_contents_provenance.py M test/api/test_jobs.py M test/api/test_libraries.py M test/api/test_search.py M test/api/test_tools.py R test/api/test_workflow_1.ga R test/api/test_workflow_2.ga R test/api/test_workflow_batch.ga M test/api/test_workflow_extraction.py R test/api/test_workflow_map_reduce_pause.ga R test/api/test_workflow_matching_lists.ga R test/api/test_workflow_missing_tool.ga R test/api/test_workflow_pause.ga R test/api/test_workflow_topoambigouity.ga R test/api/test_workflow_topoambigouity_auto_laidout.ga R test/api/test_workflow_validation_1.ga R test/api/test_workflow_with_runtime_input.ga M test/api/test_workflows.py R test/api/workflows_format_2/README.txt R test/api/workflows_format_2/__init__.py R test/api/workflows_format_2/converter.py R test/api/workflows_format_2/interface.py R test/api/workflows_format_2/main.py A test/base/data/test_workflow_1.ga A test/base/data/test_workflow_2.ga A test/base/data/test_workflow_batch.ga A test/base/data/test_workflow_map_reduce_pause.ga A test/base/data/test_workflow_matching_lists.ga A test/base/data/test_workflow_missing_tool.ga A test/base/data/test_workflow_pause.ga A test/base/data/test_workflow_topoambigouity.ga A test/base/data/test_workflow_topoambigouity_auto_laidout.ga A test/base/data/test_workflow_validation_1.ga A test/base/data/test_workflow_with_runtime_input.ga A test/base/populators.py A test/base/workflows_format_2/README.txt A test/base/workflows_format_2/__init__.py A test/base/workflows_format_2/converter.py A test/base/workflows_format_2/interface.py A test/base/workflows_format_2/main.py M test/manual/workflows_scaling.py Log Message: ----------- Refactor API helpers for re-use in rest of test framework. - Move api.helpers to base.populators. - Refactor helper subclasses adapted to use bioblend instead of test framework stuff into base.populators for greater visibility. - Refactor workflow format 2 testing stuff for reuse by Selenium. Commit: a0177fe2f4cfa0f02e835788c3f036a17786da37 https://github.com/galaxyproject/galaxy/commit/a0177fe2f4cfa0f02e835788c3f0… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M lib/galaxy/managers/workflows.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/workflow/modules.py M test/base/workflows_format_2/main.py M test/unit/workflows/workflow_support.py Log Message: ----------- Add ability to import workflows without Galaxy modifying tool version. Needed to test workflow tool upgrades when loading workflows, but I think it is good to have a way to preserve the original tool state as well for the sake of absolute reproducibility/tracibility. Commit: 76b8a69c37093e1b222b4f264370934ee8c04bb7 https://github.com/galaxyproject/galaxy/commit/76b8a69c37093e1b222b4f264370… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M test/selenium_tests/framework.py Log Message: ----------- Capture page source and DOM of top-level frame on Selenium errors. Dump to the same directory as the last screenshot related to the error. Commit: 78b099f3a78520412a63a0c6353fe4ef09c9f4e3 https://github.com/galaxyproject/galaxy/commit/78b099f3a78520412a63a0c6353f… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation-data.yml A test/selenium_tests/_workflow_fixtures.py M test/selenium_tests/framework.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_workflow_editor.py A test/selenium_tests/test_workflow_management.py A test/selenium_tests/test_workflow_run.py Log Message: ----------- Expand selenium test coverage for workflows. Expand and then break out workflow management tests into its own file since these aren't related to the workflow editor per se. Includes new tests of workflow "viewing" and "renaming". Add a new file for testing workflow execution. This currently contains tests for simple execution with a single input and a test for running workflows with tool version upgrades. This includes a refactoring of some existing tests related to checking various things in the history panel - as part of building up good history panel abstractions. The previous constructs were ported fairly literally from older CasperJS tests. These abstractions therefore referred to everything has "hda"s instead of history items. The newer abstractions therefore allow for collections and are built around HIDs (a visual thing exposed to the user) instead of HDA IDs. I think this is higher-level and more appropriate for a web functional test. Rebase into workflow GUI tests. Commit: dcf3b21752070c8a2b2747cc921db91fdd3ab42d https://github.com/galaxyproject/galaxy/commit/dcf3b21752070c8a2b2747cc921d… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M .ci/flake8_lint_include_list.txt M lib/galaxy/managers/workflows.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/workflow/modules.py R test/api/helpers.py M test/api/test_dataset_collections.py M test/api/test_datasets.py M test/api/test_histories.py M test/api/test_history_contents.py M test/api/test_history_contents_provenance.py M test/api/test_jobs.py M test/api/test_libraries.py M test/api/test_search.py M test/api/test_tools.py R test/api/test_workflow_1.ga R test/api/test_workflow_2.ga R test/api/test_workflow_batch.ga M test/api/test_workflow_extraction.py R test/api/test_workflow_map_reduce_pause.ga R test/api/test_workflow_matching_lists.ga R test/api/test_workflow_missing_tool.ga R test/api/test_workflow_pause.ga R test/api/test_workflow_topoambigouity.ga R test/api/test_workflow_topoambigouity_auto_laidout.ga R test/api/test_workflow_validation_1.ga R test/api/test_workflow_with_runtime_input.ga M test/api/test_workflows.py R test/api/workflows_format_2/README.txt R test/api/workflows_format_2/__init__.py R test/api/workflows_format_2/converter.py R test/api/workflows_format_2/interface.py R test/api/workflows_format_2/main.py A test/base/data/test_workflow_1.ga A test/base/data/test_workflow_2.ga A test/base/data/test_workflow_batch.ga A test/base/data/test_workflow_map_reduce_pause.ga A test/base/data/test_workflow_matching_lists.ga A test/base/data/test_workflow_missing_tool.ga A test/base/data/test_workflow_pause.ga A test/base/data/test_workflow_topoambigouity.ga A test/base/data/test_workflow_topoambigouity_auto_laidout.ga A test/base/data/test_workflow_validation_1.ga A test/base/data/test_workflow_with_runtime_input.ga A test/base/populators.py A test/base/workflows_format_2/README.txt A test/base/workflows_format_2/__init__.py A test/base/workflows_format_2/converter.py A test/base/workflows_format_2/interface.py A test/base/workflows_format_2/main.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation-data.yml M test/manual/workflows_scaling.py A test/selenium_tests/_workflow_fixtures.py M test/selenium_tests/framework.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_workflow_editor.py A test/selenium_tests/test_workflow_management.py A test/selenium_tests/test_workflow_run.py M test/unit/workflows/workflow_support.py Log Message: ----------- Merge pull request #3371 from jmchilton/selenium_workflow Expand selenium test coverage for workflows. Compare: https://github.com/galaxyproject/galaxy/compare/627fafafdfb1...dcf3b2175207

1 0

[galaxyproject/galaxy] dfcd8e: Rework display of inputs for workflow form.
by GitHub 08 Jan '17

08 Jan '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: dfcd8e4bf69cccd50a5482b5440937e11e569b84 https://github.com/galaxyproject/galaxy/commit/dfcd8e4bf69cccd50a5482b54409… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-26 (Mon, 26 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js A client/galaxy/scripts/mvc/workflow/workflow-icons.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M lib/galaxy/managers/workflows.py Log Message: ----------- Rework display of inputs for workflow form. - If steps have labels, use them. - Use workflow icon from workflow editor in step bar. - Eliminate "Step Index" from display of workflow steps. Commit: cd0387f7ba0da51806cea4224da20f908faadc97 https://github.com/galaxyproject/galaxy/commit/cd0387f7ba0da51806cea4224da2… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-26 (Mon, 26 Dec 2016) Changed paths: M static/maps/mvc/form/form-input.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/tool/tool-form-composite.js.map A static/maps/mvc/workflow/workflow-icons.js.map M static/maps/mvc/workflow/workflow-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/bundled/login.bundled.js.map M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/tool/tool-form-composite.js A static/scripts/mvc/workflow/workflow-icons.js M static/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Repack client scripts. Commit: c8ef41f1f1212457c2040ba4f14d7403c3f2aeb9 https://github.com/galaxyproject/galaxy/commit/c8ef41f1f1212457c2040ba4f14d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-12-26 (Mon, 26 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-section.js 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.map Log Message: ----------- Undo changes label handling adjustments to form-input and form-section modules Commit: 69e6ff724fd69fe6fec976667b22b0a717328379 https://github.com/galaxyproject/galaxy/commit/69e6ff724fd69fe6fec976667b22… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-section.js 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.map Log Message: ----------- Merge pull request #51 from guerler/workflow_inputs_display_000 Undo changes label handling adjustments to form-input and form-section modules Commit: ccdf09b099c1201aa1e4b5d0537547cf162998cf https://github.com/galaxyproject/galaxy/commit/ccdf09b099c1201aa1e4b5d05375… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js 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: ----------- Remove unused local variable Commit: e846b517c16014d5b32ffef4d23998d5cd2170d2 https://github.com/galaxyproject/galaxy/commit/e846b517c16014d5b32ffef4d239… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-composite.js Log Message: ----------- Rely on backend to specify label Commit: 71b64472c645cacbba3674f5a0f48c675b29437d https://github.com/galaxyproject/galaxy/commit/71b64472c645cacbba3674f5a0f4… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M static/maps/mvc/form/form-input.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/tool/tool-form-composite.js Log Message: ----------- Repack scripts Commit: d84221ea47719049c5415f7edc88736d22955f44 https://github.com/galaxyproject/galaxy/commit/d84221ea47719049c5415f7edc88… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M static/maps/mvc/form/form-section.js.map M static/maps/mvc/tool/tool-form-composite.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/form/form-section.js M static/scripts/mvc/tool/tool-form-composite.js Log Message: ----------- Add label hiding option without need to overwrite actual label Commit: bcd660c9f0d27e7da87f8c124d09526882382f13 https://github.com/galaxyproject/galaxy/commit/bcd660c9f0d27e7da87f8c124d09… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-12-28 (Wed, 28 Dec 2016) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Refine workflow step title display in run form. - Go back to prefixing with the step number as discussed on #3369. - Use the label regardless of step type - don't ignore tool labels. Commit: a24ce4c61f6899d13bd2197144fa0a3ea379af5a https://github.com/galaxyproject/galaxy/commit/a24ce4c61f6899d13bd2197144fa… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js A client/galaxy/scripts/mvc/workflow/workflow-icons.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M lib/galaxy/managers/workflows.py M static/maps/mvc/form/form-section.js.map M static/maps/mvc/tool/tool-form-composite.js.map A static/maps/mvc/workflow/workflow-icons.js.map M static/maps/mvc/workflow/workflow-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.map M static/scripts/mvc/form/form-section.js M static/scripts/mvc/tool/tool-form-composite.js A static/scripts/mvc/workflow/workflow-icons.js M static/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Merge branch 'workflow_inputs_display' of https://github.com/jmchilton/galaxy into jmchilton-workflow_inputs_display Commit: 5bfffac06965136c970f3ddfd20ff770dc092324 https://github.com/galaxyproject/galaxy/commit/5bfffac06965136c970f3ddfd20f… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: 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/login.bundled.js.map Log Message: ----------- repack Commit: 627fafafdfb1fea1cc5c456f11752c090129336f https://github.com/galaxyproject/galaxy/commit/627fafafdfb1fea1cc5c456f1175… Author: Bjoern Gruening <bjoern.gruening(a)gmail.com> Date: 2017-01-08 (Sun, 08 Jan 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js A client/galaxy/scripts/mvc/workflow/workflow-icons.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M lib/galaxy/managers/workflows.py M static/maps/mvc/form/form-section.js.map M static/maps/mvc/tool/tool-form-composite.js.map A static/maps/mvc/workflow/workflow-icons.js.map M static/maps/mvc/workflow/workflow-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/bundled/login.bundled.js.map M static/scripts/mvc/form/form-section.js M static/scripts/mvc/tool/tool-form-composite.js A static/scripts/mvc/workflow/workflow-icons.js M static/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Merge branch 'jmchilton-workflow_inputs_display' into dev Compare: https://github.com/galaxyproject/galaxy/compare/dad4c60d852d...627fafafdfb1

1 0