Commit Graph
20284 Commits
Author SHA1 Message Date
Martin Cech 51cbf440bf Merge pull request #7755 from jmchilton/job_error_reporting
Report a couple common errors in dataset/job report.
2019-04-16 13:30:12 -04:00
John Chilton 44856a3f75 Report a couple common errors in dataset/job report.
Report if empty inputs were used or if the same input was used more than once, these were identified as common sources of potential errors across many tools. Neither of these are definite problems, but both could be depending on the tool and both happen frequently. Outline a few more ideas as TODOs in the code.
2019-04-16 10:24:28 -04:00
John Chilton cfa763ff29 Merge pull request #7748 from nsoranzo/follow-up_on_7659
Replace ``enable_beta_export_format2_default`` with ``default_workflow_export_format``
2019-04-16 08:55:50 -04:00
Marius van den Beek 848a963da9 Merge pull request #7744 from natefoo/pulsar-0.9.0
Upgrade pulsar-galaxy-lib to 0.9.0
2019-04-16 11:49:49 +02:00
Martin Cech 30ccb0d7a5 Merge pull request #7743 from mvdbeek/rename_future_to_default
Rename _future_expose_api to expose_api, expose_api to legacy_expose_api
2019-04-15 16:33:37 -04:00
Nicola Soranzo 7f88f76d5b Merge pull request #7740 from dannon/dep-upgrades
Python dependency upgrades
2019-04-15 20:26:52 +01:00
Nicola Soranzo 305ca77cc2 Replace `enable_beta_export_format2_default with default_workflow_export_format`
This allows future different formats to be included.

Also remove promises about next release.
2019-04-15 20:11:26 +01:00
John Chilton 2d2c7ab36c Merge pull request #7737 from nsoranzo/more_migration_fixes
Many more migration fixes
2019-04-15 14:31:59 -04:00
Nicola Soranzoandmvdbeek 7ae6d700cc Replace from x import a as a instances
Co-Authored-By: mvdbeek <m.vandenbeek@gmail.com>
2019-04-15 20:29:47 +02:00
John Chilton 06fc513d05 Merge pull request #7712 from mvdbeek/include_hostname
Add hostname to task message queues
2019-04-15 14:24:24 -04:00
John Chilton c33b4d4364 Merge pull request #7724 from mvdbeek/dependent_jobs
Unpause dependent jobs when resuming jobs
2019-04-15 14:16:47 -04:00
Nicola Soranzo 94fb97ecb7 Remove `pinned-dev-requirements.txt if empty 2019-04-15 18:35:15 +01:00
mvdbeek dc1834c93b Rename _future_expose_api to expose_api, expose_api to legacy_expose_api 2019-04-15 19:12:17 +02:00
Nate Coraor de24e9eb2b Upgrade pulsar-galaxy-lib to 0.9.0 for Python 3 fix. 2019-04-15 13:10:59 -04:00
Dannon Baker b812afb739 Leave sqlalchemy pinned to 1.2.18 2019-04-15 12:15:38 -04:00
Dannon Baker 271d947cdf Rerun using Docker-based dependency updater. 2019-04-15 12:13:47 -04:00
Dannon Baker c2a6731b46 Dependency upgrades pass 2019-04-15 11:31:40 -04:00
John Chilton 10be2cd8ac Merge pull request #7713 from mvdbeek/more_defensive_iteration
Copy tools_by_id before collecting dependency status
2019-04-15 08:23:07 -04:00
Nicola Soranzo 061a07b020 More migration refactoring 2019-04-13 03:28:54 +01:00
Nicola Soranzo 3a9991ec95 Refactor migrations dropping indexes 2019-04-13 03:28:54 +01:00
Nicola Soranzo 262d9ba0ea Uniform handling of SQLAlchemy Migrate bug
when adding a column with both a ForeignKey and a index in SQLite.

Also add proper downgrade to migration 37.
2019-04-13 03:28:54 +01:00
Nicola Soranzo 73998b0c07 Fix foreign keys in migration 68 for SQLite
SQLite does not always update foreign key constraints when the target
table is renamed, so we start with the table rename in both `upgrade()`
and `downgrade()`.

xref. https://www.sqlite.org/lang_altertable.html
2019-04-13 03:28:54 +01:00
Nicola Soranzo cd4006679b Fix downgrade in migration 57 for non-SQLite databases
`notify` column need to be re-added.
2019-04-13 03:28:54 +01:00
Nicola Soranzo bb77981414 Add proper downgrade to migration 101 2019-04-13 03:28:54 +01:00
Nicola Soranzo bfc7b68848 Merge branch 'release_19.01' into dev 2019-04-12 23:18:49 +01:00
Enis Afgan ab6ad17c85 Merge pull request #7720 from machristie/custos-login-button
OIDC login buttons based on configuration
2019-04-12 13:56:25 -04:00
Nicola Soranzoanddavebx e88182345a Improve logic that filters files to check
Co-Authored-By: davebx <dave@bx.psu.edu>
2019-04-12 15:33:49 +01:00
Dave B 8034f8efbe Remove unused variable. 2019-04-12 15:33:49 +01:00
Dave B 7090f836a3 Modest refactoring of the migration stages code. 2019-04-12 15:33:49 +01:00
Nicola Soranzo 9bf4a0fdb9 Fix check on links in `CompressedFile.safemembers()`
Reported by @curtisecombsjr

Fix the following traceback when installing https://toolshed.g2.bx.psu.edu/view/iuc/package_openssl_1_0/ :

```
  File "lib/tool_shed/galaxy_install/install_manager.py", line 121, in install_and_build_package_via_fabric
    tool_dependency = self.install_and_build_package(install_environment, tool_dependency, actions_dict)
  File "lib/tool_shed/galaxy_install/install_manager.py", line 79, in install_and_build_package
    initial_download=True)
  File "lib/tool_shed/galaxy_install/tool_dependencies/recipe/recipe_manager.py", line 31, in execute_step
    initial_download=initial_download)
  File "lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py", line 548, in execute_step
    dir = self.url_download(work_dir, downloaded_filename, url, extract=True, checksums=checksums)
  File "lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py", line 77, in url_download
    extraction_path = archive.extract(install_dir)
  File "lib/galaxy/util/compression_utils.py", line 111, in extract
    self.archive.extractall(extraction_path, members=self.safemembers())
  File "/usr/lib64/python2.7/tarfile.py", line 2041, in extractall
    for tarinfo in members:
  File "lib/galaxy/util/compression_utils.py", line 135, in safemembers
    raise Exception(finfo.name + " is blocked.")

openssl-1.0.2d/apps/md4.c is blocked.
```
2019-04-11 23:21:07 +01:00
mvdbeek 0b8dec5af0 Make sure dependent jobs are being unpaused
Fixes https://github.com/galaxyproject/galaxy/issues/6926
2019-04-11 19:35:20 +02:00
John Chilton 9dfa5d7041 Merge pull request #5495 from jmchilton/batch_operation_optimize
Batch bulk hide and delete operations when multi-selected.
2019-04-11 09:01:32 -04:00
John Chilton 8e4ded48b0 Cleanup stray comments, logging 2019-04-10 23:51:30 -04:00
John Chilton b07027b0ae Merge pull request #7716 from nsoranzo/fix_7714
Fix uWSGI startup with separate ini file under Python 3
2019-04-10 23:49:08 -04:00
John Chilton a25aed5781 Optimization for dataset deletion - don't check jobs if dataset terminal. 2019-04-10 20:59:33 -04:00
John Chilton d89749bad7 Bulk delete and hide operations. 2019-04-10 20:59:33 -04:00
Nicola Soranzo a12db037ca Merge branch 'release_19.01' into dev 2019-04-11 00:43:45 +01:00
Marcus Christie db25c905ae Change oidc backends to a list, to preserve order 2019-04-10 18:44:20 -04:00
Marcus Christie cdd90c1497 Add OIDC backends to config and display a login button for each
This code was taken from the OKTA PR: https://github.com/galaxyproject/galaxy/pull/7497,
since there is a similar need for the Custos integration to have a login
button.
2019-04-10 17:38:44 -04:00
Nicola Soranzo 9bbb200f23 Fix uWSGI startup with separate ini file under Python 3
Ensure ``config_file`` is a Unicode string.

Fix #7714.
2019-04-10 16:54:48 +01:00
mvdbeek 264ea2719b Use shorter fields for server_name and hostname 2019-04-10 15:05:06 +02:00
mvdbeek 13c2c080a9 Make sure server_name / hostname WorkerProcess combinations are unique 2019-04-10 15:03:15 +02:00
Nate Coraor 8d5b155f1a Merge pull request #7694 from jmchilton/fix_pulsar_metadata
Fix pulsar remote metadata with metadata_strategy == 'directory'.
2019-04-10 09:02:31 -04:00
mvdbeek b602d2206a Copy tools_by_id before collecting dependency status
Should fix https://github.com/galaxyproject/galaxy/issues/7700:
```
File "lib/galaxy/web/framework/middleware/batch.py", line 80, in __call__
    return self.application(environ, start_response)
  File "lib/galaxy/web/framework/middleware/request_id.py", line 15, in __call__
    return self.app(environ, start_response)
  File "lib/galaxy/web/framework/middleware/xforwardedhost.py", line 23, in __call__
    return self.app(environ, start_response)
  File "lib/galaxy/web/framework/middleware/translogger.py", line 71, in __call__
    return self.application(environ, replacement_start_response)
  File "lib/galaxy/web/framework/middleware/error.py", line 166, in __call__
    response = self.exception_handler(exc_info, environ)
  File "lib/galaxy/web/framework/middleware/error.py", line 181, in exception_handler
    get_vars = wsgilib.parse_querystring(environ)
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/paste/request.py", line 107, in parse_querystring
    strict_parsing=False)
  File "/global/apps/bioinf/galaxy/bin/Python-2.7.13/lib/python2.7/urlparse.py", line 409, in parse_qsl
    pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
  File "lib/galaxy/web/framework/middleware/error.py", line 154, in __call__
    app_iter = self.application(environ, sr_checker)
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__
    return self.application(environ, start_response)
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__
    return self.application(environ, start_response)
  File "lib/galaxy/web/framework/base.py", line 143, in __call__
    return self.handle_request(environ, start_response)
  File "lib/galaxy/web/framework/base.py", line 222, in handle_request
    body = method(trans, **kwargs)
  File "lib/galaxy/web/framework/decorators.py", line 101, in decorator
    return func(self, trans, *args, **kwargs)
  File "lib/galaxy/webapps/galaxy/controllers/admin.py", line 1736, in manage_tool_dependencies
    viewkey=viewkey)
  File "lib/galaxy/web/framework/webapp.py", line 917, in fill_template
    return self.fill_template_mako(filename, **kwargs)
  File "lib/galaxy/web/framework/webapp.py", line 930, in fill_template_mako
    return template.render(**data)
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/mako/template.py", line 462, in render
    return runtime._render(self, self.callable_, args, data)
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/mako/runtime.py", line 838, in _render
    **_kwargs_for_callable(callable_, data))
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/mako/runtime.py", line 873, in _render_context
    _exec_template(inherit, lclcontext, args=args, kwargs=kwargs)
  File "/gpfs1/data/galaxy_server/galaxy-dev/.venv/lib/python2.7/site-packages/mako/runtime.py", line 899, in _exec_template
    callable_(context, *args, **kwargs)
  File "/gpfs1/data/galaxy_server/galaxy-dev/database/compiled_templates/base.mako.py", line 69, in render_body
    __M_writer(unicode(next.body()))
  File "/gpfs1/data/galaxy_server/galaxy-dev/database/compiled_templates/webapps/galaxy/admin/manage_dependencies.mako.py", line 80, in render_body
    __M_writer(unicode(render_dependencies_details(tools, requirements_status, tool_ids_by_requirements)))
  File "/gpfs1/data/galaxy_server/galaxy-dev/database/compiled_templates/webapps/galaxy/admin/manage_dependencies.mako.py", line 50, in render_dependencies_details
    return render_render_dependencies_details(context._locals(__M_locals),tools,requirements_status,tool_ids_by_requirements)
  File "/gpfs1/data/galaxy_server/galaxy-dev/database/compiled_templates/webapps/galaxy/admin/manage_dependencies.mako.py", line 185, in render_render_dependencies_details
    __M_writer(filters.html_escape(unicode( ", ".join([tools[tid].name for tid in tool_ids]) )))
KeyError: u'testtoolshed.g2.bx.psu.edu/repos/matthias/dada2_makesequencetable/dada2_makeSequenceTable/1.10.0+galaxy0'
```

I suppose this can happen if the toolbox reloads while gathering dependencies.
2019-04-10 14:14:16 +02:00
mvdbeek 4e14a648f3 Add hostname to task message queues
This prevents processes with the same server_name on different
hosts to execute processes not destined for them.
This time I think it closes https://github.com/galaxyproject/galaxy/issues/5601
2019-04-10 13:48:23 +02:00
mvdbeek 4c9e4118f5 Restrict workflow invocation index to current user
If the user is not an admin.
Fixes https://github.com/galaxyproject/galaxy/issues/7710

An alternative would be to skip Accessibility / Ownership
exceptions, but given that we can just restrict the query
this seems like the better approach to me.
2019-04-10 11:13:59 +02:00
Marius van den Beek 45726e64b5 Merge pull request #7708 from nsoranzo/alternative_to_7093
Improve error message if GFF file is missing attribute col
2019-04-10 09:12:36 +02:00
Dannon c4486eeb1e Merge pull request #7709 from natefoo/drmaa-runner-param-fix
Fix runner param validation in the DRMAA runner
2019-04-09 19:50:22 -04:00
Daniel Blankenberg d05ee64e64 Merge pull request #7703 from mvdbeek/update_pytest_postgresql
Update pytest-posgresql to 1.4.0, which removes a hard dependency on psycopg2
2019-04-09 16:02:59 -04:00
Marius van den Beek d8284f1ff5 Merge pull request #7342 from bernt-matthias/topic/verify_bam
Fall back to binary comparison if BAM conversion fails
2019-04-09 22:01:13 +02:00