Commit Graph
26055 Commits
Author SHA1 Message Date
mvdbeek 8146fcb50d Only strip c from column definition if it precedes integers 2021-03-11 16:57:31 +01:00
mvdbeek ca0af28d52 Fix workflow runs with data_column runtime parameter changes
The issue is that the fallback when no data is available uses the
default tool state but ignores values that are set at runtime.

Fixes https://github.com/galaxyproject/galaxy/issues/11593
2021-03-11 16:56:13 +01:00
John Chilton b28b784406 Merge pull request #11585 from mvdbeek/backport_empty_column_fix
[21.01] Backport Handle the case where column list is a comma-separated string
2021-03-10 09:38:48 -05:00
Kaivan Kamali d423b29336 Added another test for when columns are a comma separated string 2021-03-10 10:26:41 +01:00
Marius van den Beek 61b7cdd504 Add regression test for allowing data column selection on empty files
A test for https://github.com/galaxyproject/galaxy/pull/10981.
2021-03-10 10:26:41 +01:00
Kaivan Kamali 6e74674775 Removed whitespace 2021-03-10 10:26:41 +01:00
Kaivan Kamali 3e6aee1b4e Using utility function per code review feedback. 2021-03-10 10:26:41 +01:00
Kaivan Kamali 42a103291e Handle the case where column list is a comma-separated string 2021-03-10 10:26:41 +01:00
Juleen Graham 347388326e Implement logout without extra api call
utilise localStorage
2021-03-10 10:23:18 +01:00
Juleen Graham 30eacaa8a4 log out of oidc on galaxy logout 2021-03-10 10:23:18 +01:00
John Chilton 6a8725a641 Bug fix - poor feedback for remote file listing exceptions. 2021-03-09 11:21:03 -05:00
mvdbeek 45460cfac8 Merge branch 'release_20.09' into release_21.01 2021-03-09 15:27:49 +01:00
Dannon 81ddf7e1b5 Merge pull request #11574 from mvdbeek/anndata_select2_fix
[20.09] Don't display obs_names in select list
2021-03-09 07:38:13 -05:00
mvdbeek 358a1e52a6 Don't display obs_names in select list
This would result in thousands of select items, which breaks Select2
atm. Fixes https://github.com/galaxyproject/galaxy/issues/11406 while we
replace select2 hopefully soon.
2021-03-09 11:37:46 +01:00
Marius van den Beek 54830aa1f7 Merge pull request #11540 from dannon/remote_user_logout
[21.01] Remote user logout redirect fix
2021-03-09 10:13:53 +01:00
Alexander OSTROVSKY 58e183ae15 add compressed paf datatype 2021-03-08 13:59:19 -08:00
Dave Bouvier 3c2f919ff0 Add display_in_upload for protobuf datatypes.
These datatypes are used as an input for a tool, UShER, which is
currently being wrapped.
2021-03-05 13:10:41 -05:00
Björn Grüning 56af70cdc1 Merge pull request #11543 from jmchilton/dbkey_tests
[21.01] Bug fix - cannot set dbkeys in workflow tests.
2021-03-05 09:31:28 +01:00
John Chilton d128734d65 Bug fix - cannot set dbkeys in workflow tests. 2021-03-04 21:07:25 -05:00
Nicola Soranzo 454e755f06 Check for "format" attribute only once in output linter
Also "ext" attribute takes precedence over "format".
2021-03-04 20:40:59 +00:00
Matthias Bernt 6d229fcd6f Extend xsd doc for format attribute 2021-03-04 18:37:17 +01:00
Matthias Bernt 566f216945 allow format attribute in output collections
this works already but xsd does not allow for it
and the linter complains
2021-03-04 18:37:17 +01:00
Dannon Baker f46d965c01 This logout response is intended to be json 2021-03-04 10:52:49 -05:00
Dannon Baker ef4df2fe9d Correctly include redirect_uri in logout request 2021-03-04 10:52:49 -05:00
Björn Grüning 87978aad43 Merge pull request #11218 from guerler/add_ffindex_datatype
[21.01] Add ffindex and ffdata database file types
2021-03-04 10:03:14 +01:00
Dannon e5e4f727c8 Merge pull request #11535 from davelopez/fix_#11451
[21.01] Fix unhandled error when creating tags with multiple dots
2021-03-03 20:39:47 -05:00
Dannon Baker 77f1c8c906 Merge remote-tracking branch 'upstream/release_20.09' into release_21.01 2021-03-03 18:21:43 -05:00
Dannon ad18ff0c70 Merge pull request #11520 from dannon/oidc-logout-fix
[20.09] OIDC Logout+Redirect fix.
2021-03-03 17:41:41 -05:00
davelopez 29de9014e8 Fix NoneType with string concatenation and tag unbound error 2021-03-03 18:40:27 +01:00
mvdbeek f730592215 Merge branch 'release_20.09' into release_21.01 2021-03-02 19:14:58 +01:00
Björn Grüning 23ee1b580f use description_url 2021-03-02 19:06:36 +01:00
guerler 19165bddeb Add ffindex/ffdata database file format 2021-03-02 12:12:47 -05:00
John Chilton dcb48bd27a Merge pull request #11513 from mvdbeek/variation_report_fix
[20.09] Fix random-ish workflow error with maximum_workflow_jobs_per_scheduling_iteration
2021-03-02 11:18:34 -05:00
John Chilton 52089b218a Merge pull request #11517 from mvdbeek/subworkflow_fixes
[20.09] Fix embedding subworkflow
2021-03-02 10:15:25 -05:00
Dannon Baker 84affcf334 OIDC Logout+Redirect fix.
This was a nightmare to track down so I'm going to add extra logging for
when we toss cookies.
2021-03-02 09:36:41 -05:00
mvdbeek ae79ed6858 Test test workflow embedding in workflow editor 2021-03-02 14:09:25 +01:00
mvdbeek 6f0de082a0 Add logging if installable tool config file not found
Should make it easier to debug failing installations like this:
```
Mar 02 09:39:41 svvm0085 uwsgi[2626501]: galaxy.tool_shed.galaxy_install.install_manager ERROR 2021-03-02 09:39:41,329 [p:2626501,w:1,m:0] [uWSGIWorker1Core0] Error installing repository 'data_manager_fetch_genome_dbkeys_all_fasta'
Mar 02 09:39:41 svvm0085 uwsgi[2626501]: Traceback (most recent call last):
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:   File "/data/galaxy/galaxy//server/lib/galaxy/tool_shed/galaxy_install/install_manager.py", line 848, in install_repositories
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:     self.install_tool_shed_repository(tool_shed_repository,
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:   File "/data/galaxy/galaxy//server/lib/galaxy/tool_shed/galaxy_install/install_manager.py", line 926, in install_tool_shed_repository
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:     self.__handle_repository_contents(tool_shed_repository=tool_shed_repository,
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:   File "/data/galaxy/galaxy//server/lib/galaxy/tool_shed/galaxy_install/install_manager.py", line 574, in __handle_repository_contents
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:     dmh.install_data_managers(self.app.config.shed_data_manager_config_file,
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:   File "/data/galaxy/galaxy//server/lib/galaxy/tool_shed/galaxy_install/tools/data_manager.py", line 81, in install_data_managers
Mar 02 09:39:41 svvm0085 uwsgi[2626501]:     relative_repo_data_manager_dir = os.path.join(shed_config_dict.get('tool_path', ''), relative_install_dir)
Mar 02 09:39:41 svvm0085 uwsgi[2626501]: AttributeError: 'NoneType' object has no attribute 'get'
```
In this case there was an extra slash in the tool_path section in the
tool_path attribute of the shed_tool_config_file. Includes a small fix
where we check both paths to be compared using the abspath value.
2021-03-02 10:39:14 +01:00
mvdbeek 5c56704b44 use if max_num_job is not None 2021-03-01 22:51:55 +01:00
Nicola Soranzo e79a5dfedb Fix command line building when using interpreter
Partially revert commit efa9e0fdd1
which broke tools which use `interpreter` and `&&` or environment
variables in the `<command />`.

xref.: https://github.com/galaxyproject/galaxy/pull/10674/commits/efa9e0fdd1d11d58f4a504a3e8242cc59f3f1416#r573844945
2021-03-01 22:51:55 +01:00
Nate Coraor 7ed0f5337f Merge remote-tracking branch 'upstream/release_20.09' into release_21.01 2021-03-01 16:47:23 -05:00
Nicola Soranzo 7c8a5c18f9 Fix command line for tools using interpreter when galaxy root contains spaces 2021-03-01 21:50:04 +01:00
mvdbeek 1f82927ace Don't set empty step output if no job was created
Fixes
```
Traceback (most recent call last):
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/run.py", line 82, in __invoke
    outputs = invoker.invoke()
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/run.py", line 190, in invoke
    incomplete_or_none = self._invoke_step(workflow_invocation_step)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/run.py", line 263, in _invoke_step
    incomplete_or_none = invocation_step.workflow_step.module.execute(self.trans,
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/modules.py", line 1659, in execute
    collection_info = self.compute_collection_info(progress, step, all_inputs)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/modules.py", line 335, in compute_collection_info
    collections_to_match = self._find_collections_to_match(
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/modules.py", line 354, in _find_collections_to_match
    data = progress.replacement_for_input(step, input_dict)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/run.py", line 328, in replacement_for_input
    replacement = [self.replacement_for_connection(c) for c in connection]
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/run.py", line 328, in <listcomp>
    replacement = [self.replacement_for_connection(c) for c in connection]
  File "/Users/mvandenb/src/galaxy/lib/galaxy/workflow/run.py", line 358, in replacement_for_connection
    raise Exception(message)
Exception: Workflow evaluation problem - failed to find output_name list_output in step_outputs {}
galaxy.workflow.scheduling_manager DEBUG 2021-03-01 19:58:59,493 Workflow invocation [1] scheduled
```
2021-03-01 20:09:03 +01:00
davelopez 91edeb263a Fix enum access to values 2021-03-01 16:44:38 +01:00
John Chilton 610df0f580 Usability fix - ensure most common Galaxy file plugins (stock ones) are at the top of the dialog.
As the number of options grows, I don't want it to be harder to find FTP in particular.
2021-02-25 16:14:32 -05:00
John Chilton 3eb86d28fc More flushing to file source posix tests pass consistently. 2021-02-25 16:01:11 -05:00
John Chilton d962451794 Missing file for s3 anonymous access fix PR. 2021-02-25 16:01:10 -05:00
John Chilton ab396bfd4e Allow anonymous access to S3 buckets via file sources plugins.
```yaml
- type: s3fs
  id: genomeark
  doc: Access to Genome Ark open data on AWS..
  bucket: genomeark
  anon: true
```

0;95;0c# Please enter the commit message for your changes. Lines starting
2021-02-25 16:00:57 -05:00
Dannon 108221109a Merge pull request #11481 from jmchilton/boto_logging
[21.01] Bug fix to reduce overly verbose default botocore logging.
2021-02-25 15:46:39 -05:00
jaidevjoshi83 679a8ec135 variable names and type fixed 2021-02-25 12:28:41 -05:00
John Chilton aef769bac8 botocore logging. 2021-02-25 09:34:05 -05:00