[galaxyproject/galaxy] f27ff0: Fix to 9acbfdf: initial fix borked fa-2x, instead ...
Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: f27ff0c7ba829a48f9c0eae443baa36cda92cf98 https://github.com/galaxyproject/galaxy/commit/f27ff0c7ba829a48f9c0eae443baa... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-02-24 (Wed, 24 Feb 2016) Changed paths: M client/galaxy/style/less/base.less M client/galaxy/style/less/fontawesome/core.less M static/style/blue/base.css Log Message: ----------- Fix to 9acbfdf: initial fix borked fa-2x, instead remove second woff loaded due to fa-icon font-family rule by aliasing that to fa Commit: 7a9d4943cd0571f5adebf850b4e167065289700b https://github.com/galaxyproject/galaxy/commit/7a9d4943cd0571f5adebf850b4e16... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M test/tool_shed/base/twilltestcase.py Log Message: ----------- Fix tool shed tests for e4a1d5727805168a9fd15aca1cdd21630ada2bbc . Commit: 15c08d80e4a2c027a01dd8dabc16b802be4c18a1 https://github.com/galaxyproject/galaxy/commit/15c08d80e4a2c027a01dd8dabc16b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M client/galaxy/style/less/base.less M client/galaxy/style/less/fontawesome/core.less M static/style/blue/base.css Log Message: ----------- Merge pull request #1791 from carlfeberhard/release_16.01 [16.01] Fix to 9acbfdf: initial fix borked fa-2x, instead remove second woff … Commit: 5546211c0dddb23bbeae34c0cddbd7ad9cebf6b5 https://github.com/galaxyproject/galaxy/commit/5546211c0dddb23bbeae34c0cddbd... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M test/tool_shed/base/twilltestcase.py Log Message: ----------- Merge pull request #1798 from nsoranzo/release_16.01_tool_shed_test_fixes [16.01] Fix tool shed tests for e4a1d5727805168a9fd15aca1cdd21630ada2bbc . Commit: 1aa1d6164a63438b49beb2fd6cc4b80a57bbdb5d https://github.com/galaxyproject/galaxy/commit/1aa1d6164a63438b49beb2fd6cc4b... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M templates/webapps/galaxy/workflow/run.mako Log Message: ----------- Fix workflow parameters not rendered when tool parameter wrapped in conditional. Commit: dad1784a087623c990e0b3f05d1c8026f7bd957c https://github.com/galaxyproject/galaxy/commit/dad1784a087623c990e0b3f05d1c8... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M templates/webapps/galaxy/workflow/run.mako Log Message: ----------- Merge pull request #1799 from mvdbeek/fix_workflow_parameters_conditional [16.01] Fix workflow parameters not rendered when tool parameter wrapped in conditional. Commit: 56076db848459cb1da39b04dc635538ff013d3a9 https://github.com/galaxyproject/galaxy/commit/56076db848459cb1da39b04dc6355... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-26 (Fri, 26 Feb 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/pulsar.py Log Message: ----------- Disable command isolation for Pulsar... ... it builds its own job script - no need to have Galaxy do this isolation on the Galaxy end. The more Pulsar can handle the better. Commit: cb19630bd4e04b21653a2cb9848e888805dfabcc https://github.com/galaxyproject/galaxy/commit/cb19630bd4e04b21653a2cb9848e8... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-26 (Fri, 26 Feb 2016) Changed paths: M test/unit/jobs/test_job_wrapper.py M test/unit/tools_support.py Log Message: ----------- Fix unit tests for 56076db848459cb1da39b04dc635538ff013d3a9 Commit: 47c93180708eb138c1fa0393cd18b24d27249359 https://github.com/galaxyproject/galaxy/commit/47c93180708eb138c1fa0393cd18b... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-02-28 (Sun, 28 Feb 2016) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/pulsar.py M test/unit/jobs/test_job_wrapper.py M test/unit/tools_support.py Log Message: ----------- Merge pull request #1812 from jmchilton/pulsar_16.01_fixes [16.01] Disable command isolation for Pulsar... Commit: 865f2d49bd04b636552002cd0e4830f2dbad5c75 https://github.com/galaxyproject/galaxy/commit/865f2d49bd04b636552002cd0e483... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M create_db.sh M manage_db.sh Log Message: ----------- Fix create/manage db scripts to respect GALAXY_VIRTUAL_ENV. Commit: 5bc55f9fa2fd6af9142df644bf82e830b56f9ce4 https://github.com/galaxyproject/galaxy/commit/5bc55f9fa2fd6af9142df644bf82e... Author: guerler <aysam.guerler@gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- Add js for mako based masthead Commit: 281f5b734610963b437b72837e7b71cebbb3c5bd https://github.com/galaxyproject/galaxy/commit/281f5b734610963b437b72837e7b7... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M client/galaxy/scripts/mvc/ui/popup-menu.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/style/less/base.less M client/galaxy/style/less/fontawesome/core.less M client/galaxy/style/less/ui/icon-btn.less M doc/source/releases/16.01.rst M doc/source/releases/16.01_announce.rst M lib/galaxy/config.py M lib/galaxy/exceptions/__init__.py M lib/galaxy/exceptions/error_codes.json M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/rods.py M lib/galaxy/objectstore/s3.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/__init__.py M lib/galaxy/version.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/requests_admin.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/util/commit_util.py M lib/tool_shed/util/encoding_util.py M lib/tool_shed/util/repository_content_util.py M lib/tool_shed/util/shed_util_common.py M static/maps/mvc/ui/popup-menu.js.map M static/maps/mvc/workflow/workflow-terminals.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/popup-menu.js M static/scripts/mvc/workflow/workflow-terminals.js M static/style/blue/base.css R templates/admin/requests/select_datasets_to_transfer.mako M templates/admin/tool_shed_repository/common.mako M templates/webapps/galaxy/history/display.mako M templates/webapps/galaxy/requests/common/common.mako M templates/webapps/galaxy/requests/common/view_request_history.mako M templates/webapps/galaxy/requests/common/view_sample_datasets.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/tool_shed/repository/common.mako M test/functional/tools/output_format.xml M test/qunit/tests/workflow_editor_tests.js M test/tool_shed/base/twilltestcase.py M test/unit/jobs/test_job_wrapper.py M test/unit/tools_support.py Log Message: ----------- Merge branch 'release_16.01' of https://github.com/galaxyproject/galaxy into release_16.01 Commit: fa8beb225004d27da24065f8f633c7917b5be942 https://github.com/galaxyproject/galaxy/commit/fa8beb225004d27da24065f8f633c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M templates/webapps/tool_shed/base_panels.mako Log Message: ----------- Merge pull request #1823 from martenson/port-masthead-fix [16.01] Port masthead fix Commit: 50bc127a3b55432884ed6350bee3e0ea67beb95f https://github.com/galaxyproject/galaxy/commit/50bc127a3b55432884ed6350bee3e... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M create_db.sh M manage_db.sh Log Message: ----------- Merge pull request #1820 from jmchilton/db_script_fixes [16.01] Fix create/manage db scripts to respect GALAXY_VIRTUAL_ENV. Commit: 93494a833ee390811bdc1d13c1ef54b52ed005f2 https://github.com/galaxyproject/galaxy/commit/93494a833ee390811bdc1d13c1ef5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/config.py Log Message: ----------- This silences logging when display whitelist isn't explicitly defined and the default file doesn't exist. Explicit usage still logs a failure. Commit: 16280c63236621082ce4c3b3d93eb679294cd515 https://github.com/galaxyproject/galaxy/commit/16280c63236621082ce4c3b3d93eb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py M lib/galaxy/config.py Log Message: ----------- Only attempt to read/load sanitize_whitelist_file when starting an actual galaxy application. Commit: 7534182d7afd8c997df7d919d0633345ee5c4dfa https://github.com/galaxyproject/galaxy/commit/7534182d7afd8c997df7d919d0633... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py Log Message: ----------- Add a default logger prior to full logging configuration. We currently attempt to log at various places in config parsing/etc that fail with 'No handlers could be found for logger ...', and this resolves that. Commit: cf91ab4511897ef5ac4beb8d56219119073073c4 https://github.com/galaxyproject/galaxy/commit/cf91ab4511897ef5ac4beb8d56219... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py M lib/galaxy/config.py Log Message: ----------- Merge pull request #1828 from dannon/cherrypick_logging [16.01] Fix startup logging Commit: f67cbe72d571f87a87e868161650e5965e681881 https://github.com/galaxyproject/galaxy/commit/f67cbe72d571f87a87e868161650e... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/webapps/tool_shed/repository/view_repository.mako Log Message: ----------- revert escaping added in a24e206ff7762d5b86d3dc7240190f043dc532b5 that prevented line endings and spaces to be rendered properly Commit: 0051cab4f35240ff8b85f010b1ae0d66de7273c0 https://github.com/galaxyproject/galaxy/commit/0051cab4f35240ff8b85f010b1ae0... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/webapps/tool_shed/repository/view_repository.mako Log Message: ----------- Merge pull request #1830 from martenson/revert-ts-repo-rendering [16.01] revert ts repo long desc escaping Commit: a49401189735daa55e44dec7af6b84a646e8bbc9 https://github.com/galaxyproject/galaxy/commit/a49401189735daa55e44dec7af6b8... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-03-02 (Wed, 02 Mar 2016) Changed paths: M lib/galaxy/jobs/__init__.py Log Message: ----------- Improve dataset error log message Commit: 4992684d1fc58d4774e5d6a6c1df9c193218c460 https://github.com/galaxyproject/galaxy/commit/4992684d1fc58d4774e5d6a6c1df9... Author: Dave Bouvier <dave@bx.psu.edu> Date: 2016-03-02 (Wed, 02 Mar 2016) Changed paths: M config/tool_conf.xml.main Log Message: ----------- Hide tools that have been replaced. Commit: dfef64db75c43cd4001a67cf48143e28df3efe60 https://github.com/galaxyproject/galaxy/commit/dfef64db75c43cd4001a67cf48143... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-02 (Wed, 02 Mar 2016) Changed paths: M lib/galaxy/jobs/__init__.py Log Message: ----------- Merge pull request #1836 from natefoo/dataset-error-log [16.01] Improve dataset error log message Commit: de70306407c0682834814c479c91f8b8adc615ce https://github.com/galaxyproject/galaxy/commit/de70306407c0682834814c479c91f... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-02 (Wed, 02 Mar 2016) Changed paths: M config/tool_conf.xml.main Log Message: ----------- Merge pull request #1837 from davebx/release_16.01 [16.01] Hide tools that have been replaced. Commit: 26d5561b4ff48eb770970bee5f2ba49d425e9902 https://github.com/galaxyproject/galaxy/commit/26d5561b4ff48eb770970bee5f2ba... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-03 (Thu, 03 Mar 2016) Changed paths: M manage_tools.sh M run_reports.sh M run_tool_shed.sh Log Message: ----------- Update more scripts to respect GALAXY_VIRTUAL_ENV. Drop explicit sourcing in run_reports and run_tool_shed since they source common_startup. Commit: e0ce68cc58a6d6eeb306f5c0445563e71bcc1d12 https://github.com/galaxyproject/galaxy/commit/e0ce68cc58a6d6eeb306f5c044556... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-03 (Thu, 03 Mar 2016) Changed paths: M lib/galaxy/tools/parameters/output_collect.py Log Message: ----------- Fix lack of output when discovering large collections... Example log statement collected for each dataset: ``` galaxy.tools.parameters.output_collect DEBUG 2016-03-03 11:47:31,302 (8) Created dynamic collection dataset for path [/home/john/workspace/galaxy/database/job_working_directory/000/8/oe2_ie2.fq] with element identifier [oe2:ie2] for output [list_output]. ``` Commit: 0fbd22c9a30686afe62de1e1f23ff309dd6374a8 https://github.com/galaxyproject/galaxy/commit/0fbd22c9a30686afe62de1e1f23ff... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-03 (Thu, 03 Mar 2016) Changed paths: M lib/galaxy/tools/parameters/output_collect.py Log Message: ----------- Merge pull request #1852 from jmchilton/dataset_collection_log [16.01] Fix lack of log output when discovering large collections... Commit: 97793ab81ab5601466fa89bba7b3250118e95de4 https://github.com/galaxyproject/galaxy/commit/97793ab81ab5601466fa89bba7b32... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-03 (Thu, 03 Mar 2016) Changed paths: M manage_tools.sh M run_reports.sh M run_tool_shed.sh Log Message: ----------- Merge pull request #1847 from jmchilton/more_virtualenv_fixes [16.01] Update more scripts to respect GALAXY_VIRTUAL_ENV. Commit: e14e8a074c1344ab62dae2254f1e4a250e963b22 https://github.com/galaxyproject/galaxy/commit/e14e8a074c1344ab62dae2254f1e4... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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/dataset/dataset-li-edit.js Log Message: ----------- Allow rerun of datasets new yet queued by job manager. Commit: 0445fcda51cad08a0b2969140b48948a9e7d759b https://github.com/galaxyproject/galaxy/commit/0445fcda51cad08a0b2969140b489... Author: guerler <aysam.guerler@gmail.com> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Add workflow building mode check to collection parameter handling Commit: 8905bafe10845545bedbd1c6b9e758e1b9523b4d https://github.com/galaxyproject/galaxy/commit/8905bafe10845545bedbd1c6b9e75... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-03-06 (Sun, 06 Mar 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #1859 from guerler/fix_collection_000 [16.01] Add workflow building mode check to collection parameter handling Commit: 0e0c1caec4f14e0a5240763e697bd5d3613db719 https://github.com/galaxyproject/galaxy/commit/0e0c1caec4f14e0a5240763e697bd... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py R lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py Log Message: ----------- Fixing subworkflow migration (0131) to work with mysql Commit: 6442cbc3d4340ea3d03dad01c3ebf2dce05ed6e1 https://github.com/galaxyproject/galaxy/commit/6442cbc3d4340ea3d03dad01c3ebf... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py Log Message: ----------- Fix downgrade attempting to drop parent_workflow_id off the wrong table. Commit: b23c354f91f9d1a572f488a4d49f25b8681e58ba https://github.com/galaxyproject/galaxy/commit/b23c354f91f9d1a572f488a4d49f2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py Log Message: ----------- Replace testing keynames with real ones. Commit: ad6273307da4b971ea4354d9ad33cb08ca912577 https://github.com/galaxyproject/galaxy/commit/ad6273307da4b971ea4354d9ad33c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py Log Message: ----------- We can't flip storedworkflow back to non-nullable in a downgrade step here, so don't try. Just leave it alone. Commit: 0c34d5bd3ff414d6beb669e106306066f663d75f https://github.com/galaxyproject/galaxy/commit/0c34d5bd3ff414d6beb669e106306... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.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/dataset/dataset-li-edit.js Log Message: ----------- Merge pull request #1858 from jmchilton/rerun_new_datasets [16.01] Allow rerun of datasets new yet queued by job manager. Commit: 0f97b50e9ca8ca8b54e8d30769cd3fe46204f27c https://github.com/galaxyproject/galaxy/commit/0f97b50e9ca8ca8b54e8d30769cd3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-07 (Mon, 07 Mar 2016) Changed paths: M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py Log Message: ----------- Different logic for mysql (just don't worry about keys, due to the agony -- access to the database is entirely procedural and due to this we'd likely see any issues breaking these fk constraints in postgres before mysql (if ever) anyway. Commit: 29c78e984e52ac08b1b36a03e39b65c6edbe6200 https://github.com/galaxyproject/galaxy/commit/29c78e984e52ac08b1b36a03e39b6... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Fix virtualenv broken with #1847. Commit: 5824bc04af9270afbebcb2c8f9b6b3bea371b788 https://github.com/galaxyproject/galaxy/commit/5824bc04af9270afbebcb2c8f9b6b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Fix duplicate print statement reported by @dannon... https://github.com/galaxyproject/galaxy/pull/1890#issuecomment-193873380 Commit: 50f1089c72ff46397e525d4aa99dc80569081509 https://github.com/galaxyproject/galaxy/commit/50f1089c72ff46397e525d4aa99dc... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M lib/galaxy/visualization/data_providers/genome.py Log Message: ----------- Slight tweaks to our tabix usage. This fixes trackster without more divergence in our version of pysam. Commit: c6f3e9b5b28268cba1ef8d7be5f1bed90b6ecc00 https://github.com/galaxyproject/galaxy/commit/c6f3e9b5b28268cba1ef8d7be5f1b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M lib/galaxy/visualization/data_providers/genome.py Log Message: ----------- Slight cleanup, remove outdated comment regarding tabixfile.close() Commit: f0b7a34dd3ea5b3b10494c7e186fb10fda30441f https://github.com/galaxyproject/galaxy/commit/f0b7a34dd3ea5b3b10494c7e186fb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/quotas.py Log Message: ----------- Apply patch from Fabien Mareuil to resolve json serialization of Decimal error; for more see http://dev.list.galaxyproject.org/quota-api-error-td4669081.html Commit: a351c75687921bb8d2487577c5c4c0a64bee5e5f https://github.com/galaxyproject/galaxy/commit/a351c75687921bb8d2487577c5c4c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M lib/galaxy/visualization/data_providers/genome.py Log Message: ----------- Extra documentation for @mvdbeek Commit: 438661e8945c1bb317f75dabe3db429ea779255d https://github.com/galaxyproject/galaxy/commit/438661e8945c1bb317f75dabe3db4... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-10 (Thu, 10 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Another fix for virtualenv fixes. Commit: 62b5f207566eb9666df58f1ab107d3e7b1f0c736 https://github.com/galaxyproject/galaxy/commit/62b5f207566eb9666df58f1ab107d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-10 (Thu, 10 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Remove unnecessary encoding in remote_files. This allows paths and filenames like Ăfile.txt Commit: 0c225bec2e9af0c941ccc943d9ad010f2893a6e0 https://github.com/galaxyproject/galaxy/commit/0c225bec2e9af0c941ccc943d9ad0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-10 (Thu, 10 Mar 2016) Changed paths: M templates/webapps/galaxy/library/common/library_info.mako Log Message: ----------- Update library_info.mako escaping. This allows use of non-ascii characters like 'This is Ă data library' Commit: afb4e9c8f40da5331412c2a8f83ece814fb54b05 https://github.com/galaxyproject/galaxy/commit/afb4e9c8f40da5331412c2a8f83ec... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-10 (Thu, 10 Mar 2016) Changed paths: M lib/galaxy/visualization/data_providers/genome.py Log Message: ----------- Merge pull request #1897 from dannon/pysam_compat [16.01] Slight tweaks to our tabix usage. Commit: 3abd2c213ae508bd3547d08729c96bbff4a5b740 https://github.com/galaxyproject/galaxy/commit/3abd2c213ae508bd3547d08729c96... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-10 (Thu, 10 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/quotas.py Log Message: ----------- Merge pull request #1898 from dannon/quota_api_fix_fabien [16.01] Quota API issue with serialization to JSON of Decimal Commit: b3e9398c3affa964fdc8cf090eb5c149f7a6bf47 https://github.com/galaxyproject/galaxy/commit/b3e9398c3affa964fdc8cf090eb5c... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py Log Message: ----------- Replace get_tool_shed_repository_by_tool_shed_name_owner_changeset_revision with get_repository_for_dependency_relationship Commit: d6e38c7d482eae65fc135cd65a13b7f215220cd5 https://github.com/galaxyproject/galaxy/commit/d6e38c7d482eae65fc135cd65a13b... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py Log Message: ----------- remove unused import Commit: 5a50a4691c11edb9366f2e0d3eeb68aaaabb9c80 https://github.com/galaxyproject/galaxy/commit/5a50a4691c11edb9366f2e0d3eeb6... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py Log Message: ----------- Merge pull request #1909 from mvdbeek/backport_repository_for_dependency_relationship [16.01] Backport PR #1868 Commit: 90fcd8c668865ce109b3fbc011319a9794e9e47f https://github.com/galaxyproject/galaxy/commit/90fcd8c668865ce109b3fbc011319... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2016-03-14 (Mon, 14 Mar 2016) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Handle sections in view workflow Fixes 1723 Commit: 65a5b08c7129462a310fc741fb64e7f883bd8b0f https://github.com/galaxyproject/galaxy/commit/65a5b08c7129462a310fc741fb64e... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-03-15 (Tue, 15 Mar 2016) Changed paths: M templates/webapps/galaxy/workflow/display.mako Log Message: ----------- Merge pull request #1916 from erasche/fix-1723-back [16.01] Handle sections in view workflow Commit: 18473a187e019421933746abb31f8b226e828b80 https://github.com/galaxyproject/galaxy/commit/18473a187e019421933746abb31f8... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-03-15 (Tue, 15 Mar 2016) Changed paths: M lib/galaxy/visualization/data_providers/genome.py Log Message: ----------- Ensure chrom, start, end as bytestring in BamDataProvider Commit: 9a343efe8b7dd393842e0f971e59d575f2286de2 https://github.com/galaxyproject/galaxy/commit/9a343efe8b7dd393842e0f971e59d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-15 (Tue, 15 Mar 2016) Changed paths: M lib/galaxy/visualization/data_providers/genome.py Log Message: ----------- Merge pull request #1930 from mvdbeek/more_bytestring_for_pysam [16.01] Ensure chrom, start, end as bytestring in BamDataProvider Commit: 00a7c3af057c0689a53748802740bc2002df375c https://github.com/galaxyproject/galaxy/commit/00a7c3af057c0689a53748802740b... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-03-15 (Tue, 15 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Merge pull request #1890 from jmchilton/fix_virtualenvs [16.01] Fix virtual env handling broken with #1847. Commit: f277f99aed411fede7d1cb91d3177469922a58ae https://github.com/galaxyproject/galaxy/commit/f277f99aed411fede7d1cb91d3177... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/util/log/fluent_log.py Log Message: ----------- Fix handling of time in fluent logger. Commit: 87bcb5f5a1b6801e948b2cc0f5dc676c7faca682 https://github.com/galaxyproject/galaxy/commit/87bcb5f5a1b6801e948b2cc0f5dc6... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/util/log/fluent_log.py Log Message: ----------- Fix in a different way not requiring signature change; still not thrilled about overlapping kwarg names w/ stdlib module names. Commit: c8e48bfaccb5d10552df4200e616a9eee49206b0 https://github.com/galaxyproject/galaxy/commit/c8e48bfaccb5d10552df4200e616a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M config/galaxy.ini.sample Log Message: ----------- Add fluentd configuration to galaxy.ini.sample Commit: 98c65dcee08338ea80a7e34251f8fa4ed6bd8dd5 https://github.com/galaxyproject/galaxy/commit/98c65dcee08338ea80a7e34251f8f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/util/log/fluent_log.py M lib/galaxy/webapps/galaxy/api/metrics.py Log Message: ----------- Swap back to the first fix, update metrics api to use new signature. Commit: 4ef186812f1d3f16b36080654ee043065237d0c5 https://github.com/galaxyproject/galaxy/commit/4ef186812f1d3f16b36080654ee04... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Encode user_login as utf8 prior to directory manipulation. Commit: e3e49a477d96ec5fc4623646e7ea240090f80ae2 https://github.com/galaxyproject/galaxy/commit/e3e49a477d96ec5fc4623646e7ea2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- extreme casting to 1) make this code actually work with python 2, and 3) work should the web framework ever be functional in python3 Commit: 19bf334c7763c2418408083b9a7369386e50ad66 https://github.com/galaxyproject/galaxy/commit/19bf334c7763c2418408083b9a736... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/util/log/fluent_log.py M lib/galaxy/webapps/galaxy/api/metrics.py Log Message: ----------- Merge pull request #1945 from dannon/fluent_logging_fix [16.01] Fix handling of time in fluent logger Commit: bd0439d9b724bb72c1fab4c27a4c72814abef0b9 https://github.com/galaxyproject/galaxy/commit/bd0439d9b724bb72c1fab4c27a4c7... Author: guerler <aysam.guerler@gmail.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js M lib/galaxy/tools/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py M static/maps/mvc/tool/tool-form-base.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form-base.js Log Message: ----------- Fix tool access rights and forwarding Commit: 054fdf76f09faf35662adf0f4a8a6f6428abab4f https://github.com/galaxyproject/galaxy/commit/054fdf76f09faf35662adf0f4a8a6... Author: guerler <aysam.guerler@gmail.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Parse user when filtering tools Commit: 9e9dfdfd55b2b8d2377f8ef4e288a1fa482105b9 https://github.com/galaxyproject/galaxy/commit/9e9dfdfd55b2b8d2377f8ef4e288a... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M lib/galaxy/workflow/run.py Log Message: ----------- Fix workflow scheduler log message. Commit: 5f5f0af5cd5e21c64810d29202e149915226c34a https://github.com/galaxyproject/galaxy/commit/5f5f0af5cd5e21c64810d29202e14... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M lib/galaxy/workflow/run.py Log Message: ----------- Merge pull request #1955 from jmchilton/fix_wf_log_message [16.01] Fix workflow scheduler log message. Commit: 2efd9c2687d2ca818520249cdb3484e781659069 https://github.com/galaxyproject/galaxy/commit/2efd9c2687d2ca818520249cdb348... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Fix #1721. TODO: write test... Commit: 377ccbe23b717f9c8cb0d571de9f0d6da08a1ee8 https://github.com/galaxyproject/galaxy/commit/377ccbe23b717f9c8cb0d571de9f0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #1967 from jmchilton/fix_optional_numeric_params [16.01] Fix #1721. Commit: 566f556b076db164ce73750f33c9824fe0285530 https://github.com/galaxyproject/galaxy/commit/566f556b076db164ce73750f33c98... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js M lib/galaxy/tools/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py M static/maps/mvc/tool/tool-form-base.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form-base.js Log Message: ----------- Merge pull request #1952 from guerler/fix_tool_access_000 [16.01] Fix tool access rights and forwarding Commit: 30750c32e4817de18aecba8bc4f523f4369e7292 https://github.com/galaxyproject/galaxy/commit/30750c32e4817de18aecba8bc4f52... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py R lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py Log Message: ----------- Merge pull request #1880 from dannon/fix_migration_0131_mysql [16.01] Fixes to subworkflow migration 0131 Commit: 58346169dfbe89f845a3f2317bde514c3e65f79f https://github.com/galaxyproject/galaxy/commit/58346169dfbe89f845a3f2317bde5... Author: guerler <aysam.guerler@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Fix dom duplication Commit: fa1414759e604073bc45fe3f2b15dc9f21c72c4c https://github.com/galaxyproject/galaxy/commit/fa1414759e604073bc45fe3f2b15d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #1976 from guerler/fix_ui_000 [16.01] Fix dom duplication Commit: 133f77413e9fb933ec1964d279408c1fb8846db4 https://github.com/galaxyproject/galaxy/commit/133f77413e9fb933ec1964d279408... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Fix 'Resend verification' link in inactive user message box which would display as [Object object] Commit: fef166545c36df5c7ba73924c7b0ea4e1d44ec82 https://github.com/galaxyproject/galaxy/commit/fef166545c36df5c7ba73924c7b0e... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M client/galaxy/scripts/layout/page.js A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_parameter_modules.py R lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Layout: Fix optional panel rendering and associated inline css Commit: dd476fc42c57b5e17d8e1e342d7a597b986b6b3e https://github.com/galaxyproject/galaxy/commit/dd476fc42c57b5e17d8e1e342d7a5... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #1978 from carlfeberhard/release_16.01 [16.01] Fixes to page.js Commit: 79d16f71f9064c1f35a0bf4c7de1191872398428 https://github.com/galaxyproject/galaxy/commit/79d16f71f9064c1f35a0bf4c7de11... Author: guerler <aysam.guerler@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M client/galaxy/scripts/layout/masthead.js M client/galaxy/scripts/layout/page.js M static/maps/layout/masthead.js.map M static/maps/layout/page.js.map 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/masthead.js M static/scripts/layout/page.js Log Message: ----------- Fix scratchbook Commit: 9eb1db82ca4bbae598d0070de8da78172ca90fa9 https://github.com/galaxyproject/galaxy/commit/9eb1db82ca4bbae598d0070de8da7... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/lda_datasets.py Log Message: ----------- Do not convert spaces to tabs when importing datasets into a library. Reported (with fix provided) by Fabien Mareuil in http://dev.list.galaxyproject.org/automatic-adding-of-a-tab-in-a-fastq-heade... Commit: cf16b1d692d0e96f3d0aa4d2cf0f9f52c8dd7bb3 https://github.com/galaxyproject/galaxy/commit/cf16b1d692d0e96f3d0aa4d2cf0f9... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-03-22 (Tue, 22 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/lda_datasets.py Log Message: ----------- Merge pull request #1985 from nsoranzo/release_16.01_lda_fixes [16.01] Do not convert spaces to tabs when importing datasets into a library. Commit: 8e41fda58a6b8def4f261121269c321e5dd8ff34 https://github.com/galaxyproject/galaxy/commit/8e41fda58a6b8def4f261121269c3... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-23 (Wed, 23 Mar 2016) Changed paths: M client/galaxy/scripts/layout/masthead.js M client/galaxy/scripts/layout/page.js M static/maps/layout/masthead.js.map M static/maps/layout/page.js.map 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/masthead.js M static/scripts/layout/page.js Log Message: ----------- Merge pull request #1984 from guerler/fix_scratchbook_000 [16.01] Fix scratchbook Commit: 21e71a9b46b9f4cd90b8fe5023981460775e4b59 https://github.com/galaxyproject/galaxy/commit/21e71a9b46b9f4cd90b8fe5023981... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-23 (Wed, 23 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py M templates/webapps/galaxy/library/common/library_info.mako Log Message: ----------- Merge pull request #1905 from dannon/library_errors [16.01] Encoding in libraries Commit: b51bdd06b189baccab235def65d15a69c761ac28 https://github.com/galaxyproject/galaxy/commit/b51bdd06b189baccab235def65d15... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-23 (Wed, 23 Mar 2016) Changed paths: M templates/base/base_panels.mako Log Message: ----------- Basepanels don't have Galaxy object, causing failures in views like published tracks, etc., when resource urls are generated incorrectly Commit: dede9459b019ceb1212f4f152b4108632f892384 https://github.com/galaxyproject/galaxy/commit/dede9459b019ceb1212f4f152b410... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-23 (Wed, 23 Mar 2016) Changed paths: M templates/base/base_panels.mako Log Message: ----------- Merge pull request #2003 from dannon/trackster_debugging [16.01] Fix shared viz (and other base_panels.mako displays) early URL generation. Commit: dc49a9cbc1b24fb4abd1c5b98eba433218a3042d https://github.com/galaxyproject/galaxy/commit/dc49a9cbc1b24fb4abd1c5b98eba4... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-24 (Thu, 24 Mar 2016) Changed paths: M lib/galaxy/tools/execute.py Log Message: ----------- Fix unbound error that is possible if using tool bursting. Commit: 8accc56132ff5863ff4d0e3127d9aa5c8fc419d4 https://github.com/galaxyproject/galaxy/commit/8accc56132ff5863ff4d0e3127d9a... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-25 (Fri, 25 Mar 2016) Changed paths: M lib/galaxy/tools/execute.py Log Message: ----------- Merge pull request #2009 from jmchilton/execute_params_fix [16.01] Fix unbound error that is possible if using tool bursting. Commit: 7d1b525682c9dd0786b7ccca23c3b0695b3c0751 https://github.com/galaxyproject/galaxy/commit/7d1b525682c9dd0786b7ccca23c3b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-25 (Fri, 25 Mar 2016) Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/webapps/galaxy/api/datasets.py M static/maps/viz/trackster/tracks.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/trackster/tracks.js Log Message: ----------- The response from dataproviders here can return data===null in addition to being simply undefined. This corrects the logic shortcutting and prevents errors like 'Cannot read property 'min' of null' Commit: 425f0daa2d9030a36c2af5b144a4d563542153a2 https://github.com/galaxyproject/galaxy/commit/425f0daa2d9030a36c2af5b144a4d... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-03-25 (Fri, 25 Mar 2016) Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/webapps/galaxy/api/datasets.py M static/maps/viz/trackster/tracks.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/trackster/tracks.js Log Message: ----------- Merge pull request #2014 from dannon/trackster_dataprovider_fix [16.01] Fix trackster erroring when fetching data from regions or datasets with no content. Commit: 4f2661a1e9b3179b8df7ff773b71d15aa756dd8d https://github.com/galaxyproject/galaxy/commit/4f2661a1e9b3179b8df7ff773b71d... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-25 (Fri, 25 Mar 2016) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/workflow/modules.py Log Message: ----------- Fix PJA creation in tool bursting threads. Potentially fixes #1657. Commit: 948a4aa55bf9409a69b7af75b9987d60f09890f3 https://github.com/galaxyproject/galaxy/commit/948a4aa55bf9409a69b7af75b9987... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-03-25 (Fri, 25 Mar 2016) Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/workflow/modules.py Log Message: ----------- Merge pull request #2013 from jmchilton/fix_1657_stable [16.01] Fix PJA creation in tool bursting threads. Commit: e6d3529b4c85708bb0b1fbea32e8ce36921e60e1 https://github.com/galaxyproject/galaxy/commit/e6d3529b4c85708bb0b1fbea32e8c... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M lib/galaxy/jobs/__init__.py Log Message: ----------- [16.01] Fix for running jobs when metadata tool is not in toolbox. Happens when -installed or -migrated are passed into run_tests.sh because of the way the tool shed hacks up Galaxy's tool config. Commit: 68ca4b9237a5c44a88377c32cecc9014013c32cc https://github.com/galaxyproject/galaxy/commit/68ca4b9237a5c44a88377c32cecc9... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-03-29 (Tue, 29 Mar 2016) Changed paths: M lib/galaxy/jobs/__init__.py Log Message: ----------- Merge pull request #2024 from jmchilton/metadata_tool_fix [16.01] Fix for running jobs when metadata tool is not in toolbox. Commit: 7b2a2b1ef1154699d064482ffc41b4d3b6efdabb https://github.com/galaxyproject/galaxy/commit/7b2a2b1ef1154699d064482ffc41b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-29 (Tue, 29 Mar 2016) Changed paths: M test/unit/test_lazy_process.py Log Message: ----------- [16.01] More robust test_lazy_process. Hopefully this will fix a transiently failing test (I've only seen in fail on OS X). Commit: 7c94ac8d93b8c7fd2dd2f18d3939fa23a1589ad9 https://github.com/galaxyproject/galaxy/commit/7c94ac8d93b8c7fd2dd2f18d3939f... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-03-29 (Tue, 29 Mar 2016) Changed paths: M test/unit/test_lazy_process.py Log Message: ----------- Merge pull request #2032 from jmchilton/lazy_process_test_fix [16.01] More robust test_lazy_process. Compare: https://github.com/galaxyproject/galaxy/compare/5677c2ee4fce...7c94ac8d93b8
participants (1)
-
GitHub