Commit Graph
19485 Commits
Author SHA1 Message Date
Nicola Soranzo fc2bff63b3 Remove recursion from `expand_nested_tokens()`
Also add test for recursive nested token.
2019-06-05 13:54:18 +02:00
mvdbeek 574d9ad1f5 Fix nested macro/token expansion on python 3
I noticed that in multiqc @ESCAPE_IDENTIFIER@ wasn't being replaced.
It's surprising that this didn't cause any issues on python 2,
but might have to do with the iteration order changes.
2019-06-05 13:44:46 +02:00
Nicola Soranzo fd02b745c3 Merge branch 'release_18.09' into release_19.01 2019-06-03 18:06:45 +01:00
mvdbeek 44256971eb Fix ColumnSetAction post job action
If columns are specified as integers this would fail currently.
Reported by Peter Briggs on the [mailing list](https://lists.galaxyproject.org/archives/list/galaxy-dev@lists.galaxyproject.org/thread/PXLCVKIZ5LW3MLI6333PFMANYGOCDLD2/)
2019-05-31 10:44:45 +02:00
Nate Coraor c0c39d5969 Default the maximum grab limit for handler database preassignment
methods to unlimited as intended. Document the config param.
2019-05-29 15:25:55 -04:00
mvdbeek e988fdee87 Skip recording workflow outputs for input parameters
These can come in as a literal parameter value, or as a dictionary like
{'id': 'encoded_id', 'src': 'hda'}, none of which is quite right.
2019-05-24 10:45:18 +02:00
Nicola Soranzo 9b9daffd41 Merge pull request #7766 from natefoo/slurmstepd
[19.01] Catch and filter *all* Slurm cgroup-related messages
2019-05-07 15:57:31 +01:00
Dannon 7130ae9411 Merge pull request #7824 from tmcgowan/issue_7758
[19.01] Possible fix for WSGI process issue #7758
2019-05-07 09:00:37 -04:00
John Chilton ea398cbdfd Merge pull request #7857 from natefoo/fix-job-config-get-default
[19.01] Fix the job config's shared _get_default() method
2019-05-04 11:40:41 -04:00
John Chilton 98fa693a7c Fix bug preventing handler runner plugin handling. 2019-05-01 15:09:25 -04:00
Nate Coraor 1410e8cf93 Fix tests broken by previous commit, also, handler defaults are never
required (preassign uses all defined handlers if no default is set).
2019-04-30 15:01:45 -04:00
Nate Coraor 1994c3598f Merge pull request #7855 from mvdbeek/fix_workflow_extraction
[19.01] Fix workflow extraction for jobs whose JobToDatasetOutputAssociation references a discovered dataset
2019-04-30 14:48:40 -04:00
Nicola Soranzo 170bd027cd [19.01] Use just the env name when checking `CONDA_DEFAULT_ENV` (#7853)
[19.01] Use just the env name when checking ``CONDA_DEFAULT_ENV``
2019-04-30 19:36:06 +01:00
Nate Coraor 7ac30ec590 Fix the job config's shared _get_default() method so it does the correct
thing for destinations
2019-04-30 14:14:18 -04:00
Nicola Soranzo 96ed324131 Ensure that also $CONDA_DEFAULT_ENV is just the env name
That's not the case e.g. for conda 4.1.1 when using `conda_exec` not inside `conda_prefix`.
2019-04-30 17:49:49 +01:00
mvdbeek 4af1c0a6cc Fix workflow extraction for jobs whose JobToDatasetOutputAssociation references a discovered dataset
To test this run a tool that generates discovered datsets twice,
with the second run taking the first output as input.
2019-04-30 18:31:19 +02:00
mvdbeek 8fd0652d76 CONDA_DEFAULT_NAME is just the env name
This will still write the conda activate part out multiple times,
but fix the check that would otherwise lead to repeated activation
of the conda env. Fixes the slowness reported in https://github.com/galaxyproject/galaxy/issues/7849
2019-04-30 14:02:42 +02:00
Bérénice Batut 3dc68dbe92 Add extra column metadata check for minimal biom1 file 2019-04-29 18:59:25 +01:00
Thomas McGowan 966a46c9b4 Removed trailing whitespace 2019-04-25 14:29:31 -05:00
Thomas McGowan d0f07acd2d Processes -> threads to minimize server load 2019-04-25 13:36:43 -05:00
John Chilton 343e6e4cd3 Merge pull request #7786 from natefoo/job-fail-destination-loop
[19.01] Fix the use of JobMappingException
2019-04-24 14:00:27 -04:00
Nate Coraor 87b7bfd458 Fix the use of JobMappingException 2019-04-19 14:43:30 -04:00
John Chilton ca55cab671 Fix PulsarMQRunner shutdown. 2019-04-19 12:44:53 -04:00
John Chilton b0f0fdc171 Remove unused variable. 2019-04-19 12:44:48 -04:00
Nate Coraor 1ba753ca54 Catch and filter *all* Slurm cgroup-related messages 2019-04-18 12:53:34 -04: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 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
Martin Cech adfb7e65b3 Merge pull request #7682 from mvdbeek/fix_format_source_impicit_conversion
[19.01] Fix format_source for implicit conversion inputs and fasta.gz upload
2019-04-08 10:13:26 -04:00
mvdbeek 62812dd85c Use backref to implicitly_converted_parent_datasets
Thanks for the suggestion @nsoranzo.
2019-04-08 13:38:08 +02:00
mvdbeek fd6198905b Add test-data 2019-04-07 23:15:35 +02:00
mvdbeek 966cad890e Fix fasta.gz uploads
This looks like it may probably broke with https://github.com/galaxyproject/galaxy/commit/fce2dd3ae801cd13a542388746b84f9cca2a4c48
2019-04-07 23:15:35 +02:00
mvdbeek 0d20c031c2 Fix format_source when input is implicitly converted 2019-04-07 23:15:34 +02:00
mvdbeek 67e0d61ae8 Add implicitly_converted_parent_datasets to LDDA 2019-04-07 23:15:19 +02:00
Dannon Baker db094e8002 Make this slightly more robust by not worrying about whitespace in the source representation. 2019-04-06 13:43:56 -04:00
Dannon Baker 769bef16bf Slightly different fix for deleting tags with less potential side effects. 2019-04-06 13:38:02 -04:00
Sveinung Gundersen 28cd9948b7 Fixed bug when removing other tags than the first from a dataset. A space was erroneously added in front of these tags. 2019-04-06 03:52:35 +02:00
Daniel Blankenberg 77859103b7 Add charset to decorator JSON_CONTENT_TYPE 2019-04-04 16:13:19 -04:00
Daniel Blankenberg f03256ca20 Fix for trans.redirect not setting cookies/headers. Broken in https://github.com/galaxyproject/galaxy/pull/6561 2019-04-04 13:11:42 -04:00
Dannon ecc9c233c3 Merge pull request #7646 from martenson/fix-ld-ldda-library-collection
[19.01] Fix incorrect lddas being used as collection members
2019-04-03 14:11:33 -04:00
Martin Cech 8329ed6d3f Fix incorrect lddas being used as collection members
Adjust library folder api to return ldda_id on ld items
and use it for the obect passed to colelction creater
instead of the ld_id.

This bug would only materialize if you have Galaxy isntance that
has a library dataset with multiple versions. Which is the reason why
it eluded us for some time. That and missing tests.
2019-04-02 15:39:45 -04:00
Dannon bb76daf754 Merge pull request #7633 from mvdbeek/fix_early_run
[19.01] Delay workflow step execution for discovered & mapped-over input
2019-04-01 17:00:58 -04:00
Dannon 525b3facda Merge pull request #7634 from mvdbeek/fix_float_to_inst_casting
[19.01] Fix float to int casting
2019-04-01 09:26:33 -04:00
mvdbeek 8db8ce5de4 Fix float to int casting
Fixes https://github.com/galaxyproject/galaxy/issues/998
2019-03-31 17:15:46 +02:00
mvdbeek 95fc75078f Delay tool exec for discovered & mapped-over input
We should only finalize collections up until the map over depth,
as indicated by the TODO that is now obsolete.
Fixes https://github.com/galaxyproject/galaxy/issues/5867 and probably
a bunch of other issues where workflows don't run to completion.
2019-03-31 13:56:42 +02:00
pvanheus 58612dce47 backport fix from #7519
This will allow anyone with an up-to-date 19.01 server to run tests with multiple levels of subdirectories in the `test-data` directory.
2019-03-29 23:51:11 +02:00
Martin Cech 623a3b81ca check for validity of user-given changesets 2019-03-29 14:15:16 -04:00
Martin Cech dae6fd7e1d check for validity of user-given changesets 2019-03-27 16:48:15 -04:00
John Chilton 35bfc69932 Merge pull request #7578 from mvdbeek/fix_saving_subworkflows_backport
[19.01] Backport fix saving imported subworkflows
2019-03-22 09:58:19 -04:00
mvdbeek 432659524a Fix saving imported subworkflows
whose child-workflow is included more than once.
Fixes https://github.com/galaxyproject/galaxy/issues/7261 and probably https://github.com/galaxyproject/galaxy/issues/6032
2019-03-21 22:19:38 +01:00
mvdbeek 3056fbbf12 Simple filter_output
This obviously doesn't work (yet) with filters that work
on the input dataset, but this already removes a lot of
outputs that arent' going to be produced based on static
options. Since exceptions default to priduing the dataset
this isn't much harm.
2019-03-21 20:25:43 +01:00