Commit Graph
32727 Commits
Author SHA1 Message Date
Nicola Soranzo 5e6a2572f8 Allow LDAP options not starting with OPT_
Fix https://github.com/galaxyproject/galaxy/issues/5486
2018-02-19 11:15:05 +00:00
Nicola Soranzo 0d029b39ac Merge branch 'release_17.09' into release_18.01 2018-02-16 18:48:56 +00:00
Nicola Soranzo 13e72e84c5 Merge pull request #5534 from natefoo/17.09-static-map-fix
[17.09] Map static content by default for Reports and Tool Shed webapps
2018-02-16 18:19:00 +00:00
Dannon Baker 5488cf29ea Merge pull request #5552 from davebx/18.01
[18.01] Close tempfile handles.
2018-02-16 10:22:12 -05:00
Dave B fa93d4e04b Close tempfile handles. 2018-02-16 09:41:27 -05:00
Dannon Baker 6b0e20a7a9 Merge pull request #5526 from bgruening/user_filter
[18.01] fix toolbox filters
2018-02-15 15:26:15 -05:00
anup kumar a269a95cf0 Fix the bug 2018-02-15 14:25:36 -05:00
Nuwan Goonasekera 8c941ae35a Fix for: https://github.com/galaxyproject/galaxy/issues/5527 2018-02-15 13:28:48 -05:00
Martin Cech 42c12c5188 Merge pull request #5533 from jmchilton/history_list_opts
[18.01] Improve performance bugs and misleading summary info in history list.
2018-02-15 13:06:55 -05:00
Nate Coraor 1ccd55a500 Merge pull request #5535 from jmchilton/pulsar_error_handling_1
[18.01] Fix missing job stdout/stderr on Pulsar transfer failures.
2018-02-15 12:18:19 -05:00
Martin Cech 755fb9fb21 style changes for history lists
* include title for all state indicators
* shorten title
* change style of deleted indicator
* comment out unused less variables
2018-02-15 10:35:19 -05:00
John Chilton 296af58c3d Merge pull request #5542 from martenson/optimize-nonadmin-nonanon-datalibs
[18.01] optimize nonadmin and nonanon library list permission queries
2018-02-15 10:13:30 -05:00
Martin Cech 7457ce426f optimize nonadmin and nonanon library list permission queries
Before, the code would emit extra queries per each library to
find out whether the current user has permissions on it.
By pre-fetching all of them in one query and passing around as
 a dict object we should see a considerable speedup on Galaxies
with many libraries.
2018-02-14 19:38:13 -05:00
John Chilton 283ab0459f Improve performance bugs and misleading summary info in history list.
Prefetch shared user information as counts instead of objects and do so in initial query to eliminate an extra 15 SQL queries per page and load less data related to sharing.

Replace columns that would cause HDA information to be joined into the query (history size and HDA state counts) with a spinner that will be fetched in subsequent queries on the client end. There can hundreds of thousands of datasets per history - this information shouldn't be summarized to get the initial page to render - it can be fetched one history at a time once the page is rendered.

This commit also adds a new column "Items" that corresponds to the next HID - and that I think is a good summary of the "history size" before the dataset state information is loaded and even gives additional information because that count includes collections. This also renders state information for deleted and hidden datasets that was previously missing and could cause confusion. That said I don't like the dataset summaries - I'd rather just have the item count and then job state summaries.
2018-02-14 13:21:10 -05:00
Nicola Soranzo c20b68a5dd Merge pull request #5532 from mvdbeek/bam_native_converter_fix
[18.01] Use profile="18.01" for BamNative converters
2018-02-14 16:49:40 +00:00
John Chilton 7120739230 [18.01] Fix missing job stdout/stderr on Pulsar transfer failures.
Shouldn't break backward compatiblity at all without it - but to get the outputs Pulsar requires an update (https://github.com/galaxyproject/pulsar/pull/159) as well.
2018-02-14 11:30:03 -05:00
Nate Coraor 25952e81e7 Map static content by default for Reports and Tool Shed webapps. 2018-02-14 11:12:40 -05:00
Björn Grüning ea2bac8a12 yes, the name is tool not tools :( 2018-02-14 15:20:02 +01:00
John Chilton d5687bc418 PEP8 fixes. 2018-02-14 08:27:55 -05:00
mvdbeek 5ff6be93ed Use profile="18.01" for BamNative converters
This is because samtools writes to stderr when sorting/merging large files.
Part of https://github.com/galaxyproject/galaxy/issues/5496#issuecomment-365458089.
2018-02-14 14:10:18 +01:00
Dannon Baker adaacbc665 Merge pull request #5521 from martenson/webhooks-galaxy-only
[18.01] disable loading of webhooks in TS and reports apps
2018-02-14 06:37:20 -05:00
Bjoern Gruening d7de19b072 fix toolbox filters 2018-02-13 23:28:24 +01:00
Martin Cech ed23cc652d Merge pull request #5514 from jmchilton/optimize_public_grids
[18.01] Optimize public grid database interactions.
2018-02-13 16:29:54 -05:00
Martin Cech fd1ac05cdf Merge pull request #5515 from jmchilton/optimize_workflow_list
[18.01] Optimize database interaction for user workflow list.
2018-02-13 15:15:04 -05:00
John Chilton 80a41f3274 Optimize public grid database interactions.
For all four grid types (histories, viz, workflows, and pages), this computes rating average on the server and prefetches any annotations. This eliminates at least two extra queries for response element in the grid. See comment in the history controller for why I am fairly confident this is a good idea for annotations but tags are less obvious - these grids still go back to the postgres server multiple times per rendered item to render tags.

I'm confident we should either subqueryload, joinedload, or upgrade to sqlalchemy 2.2 and selectinload (http://docs.sqlalchemy.org/en/latest/orm/loading_relationships.html#sqlalchemy.orm.selectinload) the tags as well - but I'm not sure which without being able to hack on a usegalaxy.org.

This also brings in less of the user model (only username instead of all of it) to reduce over-the-wire transmission of unneeded data from postgres to Galaxy.

For workflows we were LEFT OUTER JOIN-ing on the steps of the latest workflow - so we were bringing back a lot of extra rows for data that was completely unused. In light of this, it makes perfect sense to me why published workflows were the slowest of these and I suspect they will all be equally performant after this change (modulo the number of rows in the tables and the number of rows rendered).
2018-02-13 14:29:29 -05:00
Martin Cech b9ddec71a4 disable loading of webhooks in TS and reports apps 2018-02-13 14:16:45 -05:00
John Chilton e73731f552 Optimize database interaction for user workflow list.
Don't LEFT OUTER JOIN workflow against its steps to produce step count - this causes a lot of duplicated workflow data and fetches step data not needed to just produce a step count.

Tweak pre-fetching for workflows shared with user also.
2018-02-13 11:53:10 -05:00
John Chilton 321cd78ad8 Merge pull request #5512 from mvdbeek/fix_new_pysam
[18.01] Make galaxy compatible with pysam 0.14
2018-02-13 11:22:04 -05:00
mvdbeek 3b8a2f9edc Pin pysam to 0.14 2018-02-13 15:22:51 +01:00
mvdbeek 349b25b74a Minimize duplication of BAM set_meta code 2018-02-13 11:49:10 +01:00
Nate Coraor aefe0e1449 Merge pull request #5510 from martenson/ts-deny-codefile
[18.01] do not allow codefiles for TS tool loading
2018-02-12 16:46:11 -05:00
mvdbeek b87d57aac7 Make galaxy compatible with pysam 0.14 2018-02-12 22:03:49 +01:00
Martin Cech ba3b3d5c18 do not allow codefiles for TS tool loading 2018-02-12 14:06:50 -05:00
Björn Grüning c5568a7b1a Merge pull request #5467 from dannon/workflow_sharing_link_fixes
[18.01] Workflow sharing link fixes
2018-02-11 11:49:55 +01:00
Dannon Baker d91078024b Merge pull request #5491 from nsoranzo/release_18.01_fix_common_startup_for_bare_clone
[18.01] Fix common_startup.sh for galaxy tarballs
2018-02-08 13:20:46 -05:00
Dave B 3f50b45a4e Merge pull request #5445 from gregvonkuster/add-ideaspre
[18.01] Add support for the ideaspre datatype
2018-02-08 13:11:10 -05:00
Nicola Soranzo eba3fb4b35 Fix common_startup.sh for galaxy tarballs
Do not assume git is installed and the `.git` directory is present.

Fix https://github.com/galaxyproject/galaxy/issues/5466
2018-02-08 11:52:24 -05:00
Nate Coraor 977bbf1481 Install node and yarn in common_startup.sh using nodeenv and the venv's
npm.
2018-02-08 11:33:55 -05:00
Nate Coraor b463be78a5 Add nodeenv to dev requirements 2018-02-08 11:33:35 -05:00
John Chilton 64e4e8b572 Merge pull request #5482 from mvdbeek/bam_recursion_bug
[18.01] Fix recursion bug in BamNative datatype
2018-02-08 08:14:48 -05:00
John Chilton e9ed97f533 Merge pull request #5485 from scholtalbers/fix/#5484_rename_post_actions
[18.01] Fix #5484
2018-02-08 08:11:51 -05:00
Jelle Scholtalbers db069198af fix #5484 2018-02-08 10:42:31 +01:00
Marius van den Beek 8b0e3bd28f Fix recursion bug in BamNative datatype
We introduced this in
https://github.com/galaxyproject/galaxy/pull/5180/ where we moved a lot
of code form the Bam class into the BamNative class.

Reported by @natefoo
2018-02-07 23:00:44 +01:00
Dannon Baker 62540a9747 Merge pull request #5470 from natefoo/revert-5036
[18.01] Revert #5036
2018-02-07 14:49:06 -05:00
Nate Coraor 11ec4ee93d Revert "Try next dep. resolver if building env failed"
This reverts commit e821d469e6.
2018-02-07 13:16:18 -05:00
Nate Coraor 04e4da0d31 Revert "Avoid duplicate dependency installation"
This reverts commit c0cf41a15c.
2018-02-07 13:16:11 -05:00
Dannon Baker 9df2813524 Fix more workflow sharing broken links 2018-02-07 12:45:40 -05:00
Dannon Baker 7feef3dc0e Fix "Go back to workflows list" link on workflow sharing interface. 2018-02-07 12:45:40 -05:00
Nate Coraor c2abd3f813 Merge pull request #5395 from martenson/production-1801
[18.01] Build production client
2018-02-05 16:49:09 -05:00
Dannon Baker c3ada7f169 Merge pull request #5460 from jmchilton/fix_oom_parse
[18.01] Fix tool stdio level parsing for OOM level.
2018-02-05 15:04:30 -05:00