Commit Graph
39970 Commits
Author SHA1 Message Date
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
John Chilton 8f2e9246bf Merge pull request #7738 from nsoranzo/fix_comments
Fix comments
2019-04-15 08:19:19 -04:00
Nicola Soranzo 1b1f6e9cda Fix comments 2019-04-14 18:02:42 +01:00
Nicola Soranzo bfc7b68848 Merge branch 'release_19.01' into dev 2019-04-12 23:18:49 +01:00
Björn Grüning a6c531e3c5 Merge pull request #7723 from nsoranzo/release_19.01_fix_safemembers
[19.01] Fix check on links in ``CompressedFile.safemembers()``
2019-04-12 22:24:41 +02:00
Nicola Soranzo 049732f46a Merge pull request #7727 from VJalili/send_to_cloud
Commented-out cloudbridge requirement for the cloud/send tool.
2019-04-12 18:57:30 +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 Soranzo 8e3d85697c Merge pull request #7248 from davebx/migration_stages
Modest refactoring of the migration stages code.
2019-04-12 17:31:47 +01: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 06ec2d6e4c Merge branch 'release_19.01' into dev 2019-04-12 15:02:11 +01:00
Nicola Soranzo 0bfebb4e84 Merge branch 'release_18.09' into release_19.01 2019-04-12 14:35:03 +01:00
vahid 3798a3d124 Commented-out cloudbridge requirement for the cloud/send tool. 2019-04-12 08:46:46 -04:00
Nicola Soranzo 177a2a1cf3 Merge branch 'release_18.05' into release_18.09 2019-04-12 13:02:12 +01:00
Nicola Soranzo d545e88703 Add test case and use assertRaises()
Also remove temporary directory.
2019-04-12 12:41:48 +01:00
Marius van den Beek 5d1df57f7f Merge pull request #7725 from nsoranzo/release_18.05_more_ci_backports
[18.05] Backport other CI config changes
2019-04-12 09:51:28 +02: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
Nicola Soranzo d4030757f9 Backport other CI config changes
`py35-unit` and `py35-first_startup` jobs were green on CircleCI, but doing
nothing.
Remove duplicated jobs from TravisCI.
2019-04-11 20:04:26 +01: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 fc0b9d9572 Merge pull request #7717 from nsoranzo/followup_on_7569
Fix mtx datatype sniffer configuration
2019-04-10 23:50:34 -04:00
John Chilton faeb7aecf1 Merge pull request #7722 from nsoranzo/fix_GALAXY_RUN_ALL_macOS
Fix (re)starting Galaxy using paste, ``GALAXY_RUN_ALL=1`` and ``--wait`` under macOS
2019-04-10 23:49:36 -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 69ac88f319 Fix (re)starting Galaxy using paste, `GALAXY_RUN_ALL=1 and --wait` under macOS
xref. https://github.com/galaxyproject/bioblend/commit/99d05e6ad697edc82c58f8ce7302be2a005c6933
2019-04-11 01:33:21 +01: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 671f2b65cf Remove encoding of redirect_uri
The redirect_uri generated by requests-oauthlib (Custos) already
has its query parameters encoded, so calling `encodeURI` results
in those parameters being double encoded.
2019-04-10 18:29:35 -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 aa6993e937 Fix mtx datatype sniffer configuration
Follow-up on https://github.com/galaxyproject/galaxy/pull/7569

Fix the following exception at Galaxy startup:
```
galaxy.datatypes.registry ERROR 2019-04-10 19:07:33,159 [p:3319,w:0,m:0] [MainThread] Error calling method mtx from class <module 'galaxy.datatypes.tabular' from 'lib/galaxy/datatypes/tabular.pyc'>
Traceback (most recent call last):
  File "lib/galaxy/datatypes/registry.py", line 485, in load_datatype_sniffers
    aclass = getattr(module, datatype_class_name)()
AttributeError: 'module' object has no attribute 'mtx'
```
2019-04-10 19:00:57 +01: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
John Chilton 716b8886da Merge pull request #7711 from mvdbeek/fix_workflow_invocations_inaccessible
[19.01] Restrict workflow invocation index to current user
2019-04-10 09:50:33 -04: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
Helena Rasche 6be36b8253 Merge pull request #7690 from guerler/fix_side_panel_styles
Fix side panel styling, adjust appearance in reports
2019-04-10 14:07:08 +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
Björn Grüning 78ad61506f Merge pull request #7699 from mvdbeek/fix_sort_tool_too_stringent
[19.01] Only check for exit code on actual sort command
2019-04-10 10:33:36 +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
Nate Coraor d4aa845ce7 Fix runner param validation in the DRMAA runner 2019-04-09 15:41:20 -04:00
Nicola Soranzo aa008a650b Restore check_call for sed 2019-04-09 20:26:27 +01:00
Nicola Soranzo 2d5db1efb1 More natural checks 2019-04-09 20:23:29 +01:00
Marius van den Beekandnsoranzo 6989746306 More natural check
Co-Authored-By: nsoranzo <nicola.soranzo@gmail.com>
2019-04-09 20:20:14 +01:00