Commit Graph
72677 Commits
Author SHA1 Message Date
John Davis 579884db75 Add TS db revision tags for 23.2 2024-05-31 12:25:40 -04:00
John Davis 7a9148bf02 Merge release_23.1 into release_23.2 2024-05-31 12:19:52 -04:00
Marius van den Beek aeaafc0cdc Merge pull request #18271 from jdavcs/231_ts_revision_tags
[23.1] Add revision tags for TS migration in 23.1
2024-05-31 10:02:29 +02:00
Nicola Soranzo 94ebebf4ac Merge pull request #18268 from nsoranzo/release_23.2_fix_TestToolShedConfig
[23.2] Add ``hgweb_repo_prefix`` attribute to ``TestToolShedConfig``
2024-05-30 16:43:35 +01:00
John Davis 05eecfc219 Add revision tags for TS migration in 23.1 2024-05-30 11:36:57 -04:00
John Davis dbd063e00d Merge release_23.1 into release_23.2 2024-05-30 10:57:20 -04:00
Nicola Soranzo 6d068ca5f9 Add `hgweb_repo_prefix attribute to TestToolShedConfig`
Fix the following error in unit tests:

```
AttributeError: 'TestToolShedConfig' object has no attribute 'hgweb_repo_prefix'
```

caused by merging commit b00beec3d2
forward.
2024-05-30 15:16:38 +01:00
Marius van den Beek 90c9d4756f Merge pull request #18267 from jdavcs/231_ts_migration
[23.1] Add missing TS migration
2024-05-30 15:46:20 +02:00
John Davis d0d16ebf49 Make column non-nullable 2024-05-30 09:34:38 -04:00
Nicola Soranzo bd9a16988e Merge branch 'release_23.1' into release_23.2 2024-05-30 12:41:23 +01:00
mvdbeek 063d985650 Also set model to nullable=False 2024-05-30 11:50:43 +02:00
mvdbeek 4099fcc15a Set all old keys to deleted 2024-05-30 11:45:12 +02:00
John Davis a774c9234c Add ts db migration: deleted column to api_keys tbl 2024-05-29 22:49:30 -04:00
Nate Coraor b121db548c Merge pull request #18256 from mvdbeek/server_external_hgweb
[23.1] Minor fix to enable external hgweb process
2024-05-29 11:58:14 -04:00
mvdbeek 410ccb9ab2 Fix up lock handling in hgweb_config_manager 2024-05-29 17:50:49 +02:00
mvdbeek b00beec3d2 Allow configuring hgweb repo prefix 2024-05-29 17:44:55 +02:00
Marius van den Beek 2dc7eccfef Merge pull request #18105 from mvdbeek/make_purge_query_parameter
[23.2] Allow purge query param, deprecate purge body param
2024-05-09 13:04:41 +02:00
Nicola Soranzo 40b3151626 Update `test_purge_user` test to use request parameter 2024-05-09 11:21:04 +01:00
Nicola Soranzo 127e4612cc Use `Annotated` and actual default value
as recommended in
https://fastapi.tiangolo.com/tutorial/query-params-str-validations/#alternative-old-query-as-the-default-value
2024-05-09 11:16:45 +01:00
Nicola Soranzo 788c870d13 Redact private role only once 2024-05-09 11:14:24 +01:00
mvdbeek 25825e3e30 Allow purge query param, deprecate purge body param
Fixes https://github.com/galaxyproject/galaxy/issues/18104
2024-05-08 09:13:03 +02:00
Marius van den Beek a7af3526c5 Merge pull request #18083 from davelopez/23.2_backport_18052
[23.2] Fix history export with missing dataset hids
2024-05-03 13:44:23 +02:00
davelopez 419e4954f7 Add test to verify export dataset without hid works 2024-05-02 13:21:27 +02:00
davelopez 78bf048b3a Remove unused parameters in get_export_dataset_extra_files_dir_name 2024-05-02 13:21:16 +02:00
davelopez ab868b3e76 Use dataset's encoded_id instead of hid for export filenames 2024-05-02 13:21:07 +02:00
Marius van den Beek ecef3ef5a6 Merge pull request #18053 from SaimMomin12/release_23.2
[23.2] Updated the datatypes name for FASTK tool
2024-04-29 15:57:47 +02:00
Saim Momin e0bc13cc0c [23.2] Updated the datatypes name for FASTK tool 2024-04-25 14:09:06 +02:00
David López 6a28080561 Merge pull request #17997 from davelopez/23.2_invenio_plugin_fixes
[23.2] Invenio plugin fixes
2024-04-16 17:49:27 +02:00
Martin Cech c36005b7e1 Merge pull request #17987 from mvdbeek/fix_tag_commit_in_dry_run
[23.2] Don't attempt to commit in dry_run mode
2024-04-16 16:13:10 +02:00
davelopez 133730c221 Fix sample file source for Invenio 2024-04-16 14:24:52 +02:00
davelopez c02750ec7e Fix public_name retrieval for invenio 2024-04-16 14:10:53 +02:00
davelopez ae64de668d Fix token retrieval for invenio
Do not force to use the Vault and rely on the config template value.
2024-04-16 12:54:10 +02:00
mvdbeek 7804b18f8e Don't attempt to commit in dry_run mode
Fixes https://github.com/galaxyproject/galaxy/issues/17959:
```
NotNullViolation: null value in column "workflow_step_id" of relation "workflow_output" violates not-null constraint
DETAIL:  Failing row contains (3843428, null, multiqc_fastqc_html, multiqc_fastqc_html, 1d8a0c348b6f446eb4d84770365f570f).

  File "sqlalchemy/engine/base.py", line 1890, in _execute_context
    self.dialect.do_executemany(
  File "sqlalchemy/dialects/postgresql/psycopg2.py", line 982, in do_executemany
    context._psycopg2_fetched_rows = xtras.execute_values(
  File "psycopg2/extras.py", line 1299, in execute_values
    cur.execute(b''.join(parts))
IntegrityError: (psycopg2.errors.NotNullViolation) null value in column "workflow_step_id" of relation "workflow_output" violates not-null constraint
DETAIL:  Failing row contains (3843428, null, multiqc_fastqc_html, multiqc_fastqc_html, 1d8a0c348b6f446eb4d84770365f570f).

[SQL: INSERT INTO workflow_output (workflow_step_id, output_name, label, uuid) VALUES (%(workflow_step_id)s, %(output_name)s, %(label)s, %(uuid)s) RETURNING workflow_output.id]
[parameters: ({'workflow_step_id': None, 'output_name': 'multiqc_fastqc_html', 'label': 'multiqc_fastqc_html', 'uuid': '1d8a0c348b6f446eb4d84770365f570f'}, {'workflow_step_id': None, 'output_name': 'multiqc_cutadapt_html', 'label': 'multiqc_cutadapt_html', 'uuid': '11fef12f5cf24904b31dac7a277f5fda'}, {'workflow_step_id': None, 'output_name': 'multiqc_star_html', 'label': 'multiqc_star_html', 'uuid': '383da02d5a4b4af7ac2933b9cfad316f'}, {'workflow_step_id': None, 'output_name': 'STAR_BAM', 'label': 'STAR_BAM', 'uuid': '6aed76c8a4a5491bacd2f995f16df86b'}, {'workflow_step_id': None,...
  File "starlette/applications.py", line 123, in __call__
    await self.middleware_stack(scope, receive, send)
  File "starlette/middleware/errors.py", line 186, in __call__
    raise exc
  File "starlette/middleware/errors.py", line 164, in __call__
    await self.app(scope, receive, _send)
  File "starlette_context/middleware/raw_middleware.py", line 92, in __call__
    await self.app(scope, receive, send_wrapper)
  File "starlette/middleware/base.py", line 189, in __call__
    with collapse_excgroups():
  File "contextlib.py", line 155, in __exit__
    self.gen.throw(typ, value, traceback)
  File "starlette/_utils.py", line 93, in collapse_excgroups
    raise exc
  File "starlette/middleware/base.py", line 191, in __call__
    response = await self.dispatch_func(request, call_next)
  File "galaxy/webapps/galaxy/fast_app.py", line 108, in add_x_frame_options
    response = await call_next(request)
  File "starlette/middleware/base.py", line 165, in call_next
    raise app_exc
  File "starlette/middleware/base.py", line 151, in coro
    await self.app(scope, receive_or_disconnect, send_no_error)
  File "starlette/middleware/exceptions.py", line 62, in __call__
    await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send)
  File "starlette/_exception_handler.py", line 64, in wrapped_app
    raise exc
  File "starlette/_exception_handler.py", line 53, in wrapped_app
    await app(scope, receive, sender)
  File "starlette/routing.py", line 758, in __call__
    await self.middleware_stack(scope, receive, send)
  File "starlette/routing.py", line 778, in app
    await route.handle(scope, receive, send)
  File "starlette/routing.py", line 299, in handle
    await self.app(scope, receive, send)
  File "starlette/routing.py", line 79, in app
    await wrap_app_handling_exceptions(app, request)(scope, receive, send)
  File "starlette/_exception_handler.py", line 64, in wrapped_app
    raise exc
  File "starlette/_exception_handler.py", line 53, in wrapped_app
    await app(scope, receive, sender)
  File "starlette/routing.py", line 74, in app
    response = await func(request)
  File "fastapi/routing.py", line 278, in app
    raw_response = await run_endpoint_function(
  File "fastapi/routing.py", line 193, in run_endpoint_function
    return await run_in_threadpool(dependant.call, **values)
  File "starlette/concurrency.py", line 42, in run_in_threadpool
    return await anyio.to_thread.run_sync(func, *args)
  File "anyio/to_thread.py", line 56, in run_sync
    return await get_async_backend().run_sync_in_worker_thread(
  File "anyio/_backends/_asyncio.py", line 2144, in run_sync_in_worker_thread
    return await future
  File "anyio/_backends/_asyncio.py", line 851, in run
    result = context.run(func, *args)
  File "galaxy/webapps/galaxy/api/workflows.py", line 987, in refactor
    return self.service.refactor(trans, workflow_id, payload, instance or False)
  File "galaxy/webapps/galaxy/services/workflows.py", line 218, in refactor
    return self._workflow_contents_manager.refactor(trans, stored_workflow, payload)
  File "galaxy/managers/workflows.py", line 1963, in refactor
    refactored_workflow, action_executions = self.do_refactor(trans, stored_workflow, refactor_request)
  File "galaxy/managers/workflows.py", line 1948, in do_refactor
    refactored_workflow, errors = self.update_workflow_from_raw_description(
  File "galaxy/managers/workflows.py", line 728, in update_workflow_from_raw_description
    trans.tag_handler.set_tags_from_list(
  File "galaxy/model/tags.py", line 94, in set_tags_from_list
    self.apply_item_tags(user, item, unicodify(new_tags_str, "utf-8"), flush=flush)
  File "galaxy/model/tags.py", line 265, in apply_item_tags
    self.apply_item_tag(user, item, name, value, flush=flush)
  File "galaxy/model/tags.py", line 249, in apply_item_tag
    self.sa_session.commit()
  File "<string>", line 2, in commit
  File "sqlalchemy/orm/session.py", line 1454, in commit
    self._transaction.commit(_to_root=self.future)
  File "sqlalchemy/orm/session.py", line 832, in commit
    self._prepare_impl()
  File "sqlalchemy/orm/session.py", line 811, in _prepare_impl
    self.session.flush()
  File "sqlalchemy/orm/session.py", line 3449, in flush
    self._flush(objects)
  File "sqlalchemy/orm/session.py", line 3588, in _flush
    with util.safe_reraise():
  File "sqlalchemy/util/langhelpers.py", line 70, in __exit__
    compat.raise_(
  File "sqlalchemy/util/compat.py", line 211, in raise_
    raise exception
  File "sqlalchemy/orm/session.py", line 3549, in _flush
    flush_context.execute()
  File "sqlalchemy/orm/unitofwork.py", line 456, in execute
    rec.execute(self)
  File "sqlalchemy/orm/unitofwork.py", line 630, in execute
    util.preloaded.orm_persistence.save_obj(
  File "sqlalchemy/orm/persistence.py", line 245, in save_obj
    _emit_insert_statements(
  File "sqlalchemy/orm/persistence.py", line 1156, in _emit_insert_statements
    c = connection._execute_20(
  File "sqlalchemy/engine/base.py", line 1710, in _execute_20
    return meth(self, args_10style, kwargs_10style, execution_options)
  File "sqlalchemy/sql/elements.py", line 334, in _execute_on_connection
    return connection._execute_clauseelement(
  File "sqlalchemy/engine/base.py", line 1577, in _execute_clauseelement
    ret = self._execute_context(
  File "sqlalchemy/engine/base.py", line 1953, in _execute_context
    self._handle_dbapi_exception(
  File "sqlalchemy/engine/base.py", line 2134, in _handle_dbapi_exception
    util.raise_(
  File "sqlalchemy/util/compat.py", line 211, in raise_
    raise exception
  File "sqlalchemy/engine/base.py", line 1890, in _execute_context
    self.dialect.do_executemany(
  File "sqlalchemy/dialects/postgresql/psycopg2.py", line 982, in do_executemany
    context._psycopg2_fetched_rows = xtras.execute_values(
  File "psycopg2/extras.py", line 1299, in execute_values
    cur.execute(b''.join(parts))
```

broken in https://github.com/galaxyproject/galaxy/commit/b00a94c1f7972dcd1060069fe83fece7b8943165
2024-04-15 18:14:48 +02:00
Martin Cech 346b85fe23 Merge pull request #17972 from mvdbeek/fix_new_workflow_save
[23.2] Set from_tool_form: true when saving new workflow
2024-04-11 21:04:08 +02:00
mvdbeek 0ec987faa1 Set from_tool_form: true when saving new workflow
Fixes https://github.com/galaxyproject/galaxy/issues/17963 and https://github.com/galaxyproject/galaxy/issues/17970
2024-04-11 19:36:01 +02:00
mvdbeek e2d737ff2b Don't save in test_integer_input
Reproduces https://github.com/galaxyproject/galaxy/issues/17970
2024-04-11 19:36:00 +02:00
Dannon 0c775a0003 Merge pull request #17966 from davelopez/23.2_fix_message_notification_input
[23.2] Fix message input type for notifications in admin panel
2024-04-11 11:01:31 -04:00
davelopez 7e2bd277b4 Fix message input type for notifications
Otherwise, is not possible to use line breaks in the message which are supported by the API with full markdown support.
2024-04-11 15:31:57 +02:00
Nicola Soranzo f33c5a4ca6 Merge branch 'release_23.1' into release_23.2 2024-04-10 17:43:11 +01:00
Nicola Soranzo dc9e078808 Merge branch 'release_23.0' into release_23.1 2024-04-10 17:42:00 +01:00
Nicola Soranzo 659e87f029 Merge pull request #17955 from nsoranzo/release_23.0_fix_XForwardedHostMiddleware
[23.0] Fix KeyError in ``XForwardedHostMiddleware``
2024-04-10 13:20:48 +01:00
Nicola Soranzo 11bb4b414b Fix KeyError in `XForwardedHostMiddleware`
when `REMOTE_ADDR` is not defined.
Reported by @vazovn .

Also fix typos in environment variable names.
2024-04-10 12:09:24 +01:00
Marius van den Beek 206fe020af Merge pull request #17952 from mvdbeek/fix_implicit_conversion_mapped_over
[23.2] Fix missing implicit conversion for mapped over jobs
2024-04-10 09:36:56 +02:00
mvdbeek ec6a8e72dd Fix implicit conversion for mapped over inputs
Fixes https://github.com/galaxyproject/galaxy/issues/17940
2024-04-09 19:44:36 +02:00
mvdbeek 8d52714199 Add test for implicit map over conversion in workflow
This test fails because cut fails on the compressed input with
`cut: /private/var/folders/df/6xqpqpcd7h73b6jpx9t6cwhw0000gn/T/tmpu8gqd71c/tmpmae9egoz/tmpz8sonmgx/database/objects/6/9/8/dataset_69847aef-7b3f-4915-a8ae-394921dbe388.dat: Illegal byte sequence`
2024-04-09 19:44:36 +02:00
mvdbeek e35ea08c9b Merge branch 'release_23.1' into release_23.2 2024-04-09 15:57:34 +02:00
mvdbeek 796ed40335 Merge branch 'release_23.0' into release_23.1 2024-04-09 15:57:03 +02:00
Marius van den Beek 3abb181423 Merge pull request #17944 from nsoranzo/release_23.0_fix_17938
[23.] Fix output datatype when uncompressing a dataset with incorrect datatype
2024-04-09 14:49:04 +02:00
Nicola Soranzo 0611465e3b Fix output datatype when uncompressing a dataset with incorrect datatype
with the ``CONVERTER_gz_to_uncompressed`` tool.

Previously, if a user forced an incorrect datatype to a compressed input
dataset (e.g. `fastqsanger` instead of `fastqsanger.gz`), then the output
datatype assigned by this tool would be an invalid one (`fastqsan`).

Fix #17938.
2024-04-09 11:39:39 +01:00
Nicola Soranzo ad45629885 Merge pull request #17916 from mvdbeek/fix_cwl_test_update_script
[23.2] Adjust update_cwl_conformance_tests.sh for removed branch
2024-04-05 14:45:20 +01:00