Commit Graph
66768 Commits
Author SHA1 Message Date
Marius van den Beek e14c2d160b Merge pull request #16183 from guerler/tool_warnings_type_error
[23.0] Tool warnings can either be None or a Dictionary but not a String
2023-06-04 11:32:21 +02:00
Björn Grüning 13d644f0e8 Merge pull request #16141 from jmchilton/fix_optional_fields
[23.0] Fix optional fields being validated as missing in ts api
2023-06-04 08:28:59 +01:00
guerler cb1f4ebd44 Tool warnings can be either None or a dictionary but not a string 2023-06-03 16:45:10 +02:00
Marius van den Beek 8b14c96586 Merge pull request #16168 from dannon/fix-toolbox-flattening
[23.0] Tool filtering fix for label handling
2023-06-01 18:47:37 +02:00
Marius van den Beek 54cfd48856 Merge pull request #16170 from mvdbeek/fix_hashed_test_search
[23.0] Fix test search for mulled container hashes
2023-06-01 15:14:25 +02:00
John Chilton 59dbb258f2 Merge pull request #16165 from dannon/failed-meta-bugreport
[23.0] Show bug error for failed_meta state
2023-06-01 08:52:13 -04:00
John Chilton 5c7b458078 Merge pull request #16160 from jmchilton/release_script
[23.0] Converge release process auth discovery.
2023-06-01 08:37:35 -04:00
Dannon Baker eff2f6edd6 Backport ignore dist for jest discovery 2023-06-01 07:11:22 -04:00
Dannon Baker 4e4bdaa96a Tweak toolbox test data to cover testing w/ empty labels. 2023-06-01 07:10:12 -04:00
mvdbeek cc43c50eef Fix test search for mulled container hashes
Fixes
```
FAILED test/unit/tool_util/mulled/test_get_tests.py::test_hashed_test_search - AssertionError: assert ['bamtools --help'] == ['bamtools --help', 'samtools --help']
  Right contains one more item: 'samtools --help'
  Full diff:
  - ['bamtools --help', 'samtools --help']
  + ['bamtools --help']
```
(again). The test broke with the addition of
`osx-64/samtools-1.3.1-h0840685_11.tar.bz2` 4 days ago.
2023-06-01 12:51:21 +02:00
Dannon Baker a9c722000c Better testing of whether or not a thing is a tool for toolbox normalization/flattening 2023-05-31 23:16:08 -04:00
Dannon Baker 8a2327d6c2 Show bug error for failed_meta state 2023-05-31 14:11:01 -04:00
John Chilton 2103eb0b8e Converge release process auth discovery. 2023-05-30 13:11:27 -04:00
John Chilton 8ec95d3137 Merge pull request #16076 from mvdbeek/release_script
Add script for creating (point) releases
2023-05-30 11:24:49 -04:00
Marius van den Beek d5508f56b8 Merge pull request #16139 from dannon/ctx_rev_optional
[23.0] Make ``ctx_rev`` optional in InstalledToolShedRepository response model
2023-05-30 09:34:33 +02:00
Dannon Baker 6de151f994 In practice this is not always defined and should be treated as
optional, I think
2023-05-29 16:28:29 -04:00
mvdbeek 66ca4d5e28 Run only on galaxyproject.org owner 2023-05-28 11:16:00 +02:00
mvdbeek a4f43ca6f9 Drop package_repository argument, just use TWINE_REPOSITORY_URL 2023-05-28 11:15:59 +02:00
mvdbeek 827d9b6fc1 Fix prerelease event 2023-05-28 11:15:59 +02:00
mvdbeek c4548d0a84 --no-build-packages 2023-05-28 11:15:59 +02:00
mvdbeek 521d144ebd Fix twine upload command 2023-05-28 11:15:59 +02:00
mvdbeek d79f81905e Add publishing workflow 2023-05-28 11:15:59 +02:00
mvdbeek ebf5b73594 Set default galaxy-root option to CWD 2023-05-28 11:15:59 +02:00
mvdbeek cc7e90211b Fix no_confirm logic 2023-05-28 11:15:59 +02:00
mvdbeek f1d0be7ef9 Fail on build errors 2023-05-28 11:15:59 +02:00
mvdbeek 4464ef9248 Implement pushing to upstream git url 2023-05-28 11:15:58 +02:00
mvdbeek 20a28bf2d8 Split functionality into subcommands 2023-05-28 11:15:58 +02:00
mvdbeek 93dae39806 Ensure that merges will not conflict 2023-05-28 11:15:58 +02:00
mvdbeek d8e62f8f5a Add script for creating (point) releases
Still working on it, but it's minimally useful already.
2023-05-28 11:15:57 +02:00
Nicola Soranzo 7fea2db936 Merge branch 'release_22.05' into release_23.0 2023-05-25 13:53:52 +01:00
Nicola Soranzo 766f093e35 Merge pull request #16125 from nsoranzo/release_22.05_fix_get_file_from_conda_package
[22.05] Fix ``get_test_from_anaconda()`` and ``base_image_for_targets()`` functions
2023-05-25 11:58:59 +01:00
Nicola Soranzo ffb5291010 Fix parsing of mulled tsv files containing comments and tabs 2023-05-25 08:32:22 +01:00
Nicola Soranzo cc35a28ac8 Add test for conda `best_search_result()` 2023-05-25 08:32:21 +01:00
Nicola Soranzo a0d6e87fcc Fix testing importing modules in containers 2023-05-25 08:32:21 +01:00
Nicola Soranzo 1fedac75ab Fix `mulled-update-singularity-containers` documentation
The `mulled-singularity-testing` command was never added to the
`galaxy-tool-util` package.
2023-05-25 08:32:20 +01:00
Nicola Soranzo 95c6e4b71d Fix `get_test_from_anaconda() and base_image_for_targets()` functions
by extracting all specified files in ``get_files_from_conda_package()``
and processing them in order of precedence.

Fix broken mulled unit test:

```
FAILED test/unit/tool_util/mulled/test_get_tests.py::test_hashed_test_search - AssertionError: assert ['bamtools --help'] == ['bamtools --help', 'samtools --help']
  Right contains one more item: 'samtools --help'
  Full diff:
  - ['bamtools --help', 'samtools --help']
  + ['bamtools --help']
```

which failed because, after a new build of samtools 1.3.1 was released,
``get_file_from_conda_package()`` started returning the content of
``info/recipe/meta.yaml.template`` instead of ``info/recipe/meta.yaml``
when called inside ``get_test_from_anaconda()``. Then parsing
the content of ``info/recipe/meta.yaml.template`` in
``get_commands_from_yaml()`` failed with

```
jinja2.exceptions.UndefinedError: 'compiler' is undefined
```

because that file contains ``{{ compiler('c') }}`` .

Broken in https://github.com/galaxyproject/galaxy/pull/15682 .
2023-05-25 08:32:20 +01:00
Nicola Soranzo 5889ae0ff5 Run ToolShed tests on ubuntu-latest 2023-05-25 08:28:58 +01:00
Marius van den Beek 0901ad748f Merge pull request #16133 from mvdbeek/implicit_converter_fix
[23.0] Fix implicit converters with optional parameters
2023-05-24 14:44:48 +02:00
mvdbeek dca783b185 Add test tool for triggering implicit bigwig to wig converter 2023-05-24 10:54:31 +02:00
mvdbeek b346c82344 Inject None in optional parameters when buidling implicit converter params
Fixes:
```
KeyError: 'chrom'
  File "galaxy/tools/__init__.py", line 1909, in handle_single_execution
    rval = self.execute(
  File "galaxy/tools/__init__.py", line 2005, in execute
    return self.tool_action.execute(
  File "galaxy/tools/actions/__init__.py", line 392, in execute
    ) = self._collect_inputs(tool, trans, incoming, history, current_user_roles, collection_info)
  File "galaxy/tools/actions/__init__.py", line 327, in _collect_inputs
    inp_data, all_permissions = self._collect_input_datasets(
  File "galaxy/tools/actions/__init__.py", line 268, in _collect_input_datasets
    tool.visit_inputs(param_values, visitor)
  File "galaxy/tools/__init__.py", line 1748, in visit_inputs
    visit_input_values(self.inputs, values, callback)
  File "galaxy/tools/parameters/__init__.py", line 224, in visit_input_values
    callback_helper(
  File "galaxy/tools/parameters/__init__.py", line 159, in callback_helper
    new_value = callback(**args)
  File "galaxy/tools/actions/__init__.py", line 191, in visitor
    input_datasets[prefix + input.name] = process_dataset(value)
  File "galaxy/tools/actions/__init__.py", line 126, in process_dataset
    data = data.get_converted_dataset(trans, target_ext, target_context=parent, history=history)
  File "galaxy/model/__init__.py", line 4211, in get_converted_dataset
    self.datatype.convert_dataset(
  File "galaxy/datatypes/data.py", line 795, in convert_dataset
    job, converted_datasets, *_ = converter.execute(trans, incoming=params, set_output_hid=visible, history=history)
  File "galaxy/tools/__init__.py", line 2005, in execute
    return self.tool_action.execute(
  File "galaxy/tools/actions/__init__.py", line 453, in execute
    params=wrapped_params.params,
  File "galaxy/tools/parameters/wrapped.py", line 43, in params
    self.wrap_values(self.tool.inputs, params, skip_missing_values=not self.tool.check_values)
  File "galaxy/tools/parameters/wrapped.py", line 58, in wrap_values
    value = input_values[input.name]
```

in https://sentry.galaxyproject.org/share/issue/4f2171798f214f7ba8b947eaaebe2776/
2023-05-24 10:54:31 +02:00
John Chilton c9109317ea Fix optional fields being validated as missing.
Fixes https://github.com/galaxyproject/galaxy/issues/16135
2023-05-23 16:30:30 -04:00
Martin Cech 8b926e676f Merge pull request #16128 from mvdbeek/fix_bulk_endpoint_with_related_filter
[23.0] Fix related-hid in bulk contents API
2023-05-23 11:12:22 -04:00
Nicola Soranzo 1d59dcb409 Fix the `singularity_container_test()` function
Fix ``test_singularity_container_test`` unit test, which failed with:

```
test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py:48:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
lib/galaxy/tool_util/deps/mulled/mulled_update_singularity_containers.py:62: in singularity_container_test
    check_output(exec_command.extend(["bash", "-c", test_command]), stderr=subprocess.STDOUT)
/usr/lib/python3.8/subprocess.py:415: in check_output
    return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
/usr/lib/python3.8/subprocess.py:493: in run
    with Popen(*popenargs, **kwargs) as process:
/usr/lib/python3.8/subprocess.py:858: in __init__
    self._execute_child(args, executable, preexec_fn, close_fds,

>           args = list(args)
E           TypeError: 'NoneType' object is not iterable

/usr/lib/python3.8/subprocess.py:1569: TypeError
```

Broken in commit 1dc1e5f219 .

Also:
- Use `tmp_path` pytest fixture.
- Add type annotations.
- Code refactorings.
- Install singularity in the mulled GitHub workflow so that the 2 singularity
  unit tests are not skipped any more.
2023-05-23 12:17:23 +01:00
Marius van den Beek 6c4141bee1 Merge pull request #15981 from guerler/fix_rerun
[23.0] Fix backbone-based data selector to materialize consistent attribute set
2023-05-23 09:32:15 +02:00
John Davis 995d2d3762 Merge pull request #16137 from jdavcs/release_23.0_fix_job_rank
[23.0] Release 23.0 fix job rank
2023-05-22 21:23:32 -04:00
John Davis 248d03f62b Fix rank calculation for jobs run by anonymous users 2023-05-22 17:08:55 -04:00
guerler 001f140323 Augment test case 2023-05-22 20:45:35 +02:00
guerler e96689fe09 Fix naming of input match helper to avoid confusion 2023-05-22 18:26:28 +02:00
guerler 5ee018016b Reset previous errors when new set of errors is provided 2023-05-22 18:17:25 +02:00
John Chilton a9636fb8ed Merge pull request #16126 from mvdbeek/rerun_dce_fix
[23.0] Fix sort error when re-running job with DCE collection input
2023-05-22 10:24:32 -04:00