Commit Graph
6870 Commits
Author SHA1 Message Date
Nicola Soranzo 575a1d8358 Merge pull request #14430 from bernt-matthias/unlink-job-template
Deprecate `cluster_files_directory` and store DRMAA job template and PBS shell, error and out files in job working directory
2022-08-13 01:00:10 +01:00
Dannon Baker 3112181f3e Merge remote-tracking branch 'upstream/release_22.05' into dev 2022-08-12 13:18:53 -04:00
Matthias Bernt b81b2f827e remove more leftover references to cluster_files_directory 2022-08-12 16:07:35 +02:00
Marius van den Beek df3d5a1992 Merge pull request #14429 from mvdbeek/singularity_no_host_env_vars
[22.05] Pass ``--cleanenv`` by default to singularity command
2022-08-12 15:58:05 +02:00
Marius van den Beek f53edd1f18 Merge pull request #14314 from bernt-matthias/topic/cond_out_action_bool
Extend docs and tests for conditional output actions
2022-08-11 16:53:41 +02:00
mvdbeek 0560e43a48 Fix cache image singularity resolver if path contains uppercase chars
Fixes https://github.com/galaxyproject/galaxy/issues/14425
2022-08-11 13:32:21 +02:00
Matthias Bernt 59c372a7a9 remove cluster_files_directory from test 2022-08-11 13:02:13 +02:00
mvdbeek 0eff482466 Pass --cleanenv by default to singularity command 2022-08-10 16:52:59 +02:00
Nicola Soranzo 08a7a11dd5 Merge branch 'release_22.05' into dev 2022-08-10 08:55:08 +01:00
mvdbeek a351bd1ce9 Merge branch 'release_22.05' into dev 2022-08-09 15:12:15 +02:00
davelopez bcff4a1995 Update integration test
Test boolean expression with group names containing spaces and surrounded by single quotes
2022-08-05 15:56:21 +02:00
davelopez 4846d04dad Add unit test for quoted strings with spaces 2022-08-05 15:54:04 +02:00
davelopez af949c2fd3 Revert adding __hash__ to BaseDatabaseIdField 2022-08-04 11:23:31 +02:00
davelopez e5b11bb25b Add unit tests for DabaseIdFields hashing 2022-08-02 11:10:35 +02:00
Nicola Soranzo e383e593e0 Merge branch 'release_22.01' into release_22.05 2022-07-27 15:38:19 +01:00
Nicola Soranzo 69a3fd84f9 Add and fix type annotations 2022-07-26 23:56:33 +01:00
Michael R. Crusoe 8e05b6da24 improve typing
make: add remove-unused-imports target to clean up code
2022-07-26 23:28:41 +01:00
Nicola Soranzo 732ece9aa7 Merge pull request #14207 from jmchilton/dev_auto_update_dependencies
Upgrade to Selenium 4.3.0.
2022-07-25 10:35:19 +01:00
Dannon f7e5adc58a Merge pull request #14360 from mvdbeek/fix_empty_datasets_for_compressed_files
Support empty compressed dataset in  filter_empty_datasets tool
2022-07-24 21:55:30 -04:00
mvdbeek 3d1e98ce92 Support empty compressed dataset in filter_empty_datasets tool
Fixes https://github.com/galaxyproject/galaxy/issues/12979

CoFest contribution from Frederic and I.
2022-07-21 13:15:32 -05:00
Nicola Soranzo 130b97b539 Add some type annotations
and small fixes revealed by them.
2022-07-21 12:34:40 -05:00
Matthias Bernt fe06eea75d fix test output 2022-07-15 10:49:12 +02:00
M BerntandNicola Soranzo d7272cc987 Update test/functional/tools/options_from_metadata_file.xml
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2022-07-14 23:30:11 +02:00
Matthias Bernt d642ce34c8 fix startswith attribute of <options>
as documented in the xsd

in addition fix https://github.com/galaxyproject/galaxy/issues/14324,
i.e. document the `separator` attribute of options

also doc that only 1MB is used and lines starting with `#` are always
ignored
2022-07-14 14:19:40 +02:00
John Davis def882932d Add verify_db_is_initialized function; tests 2022-07-13 16:10:58 -04:00
John Davis 1e75d85fd4 Prevent accessing LegacyScripts.database before processing script args 2022-07-13 15:40:42 -04:00
Nicola Soranzo 23afbb64e2 Updates for stuff removed in Selenium 4.3.0 2022-07-13 10:06:33 -04:00
Matthias Bernt 85ec7832ba extend docs and tests for conditional output actions
for the case that a boolean is referred.

In this case the python string value of the parameter value
needs to be used as the value for the when tag which might be a
bit confusing.

The test is also extended such that:

- multiple (two) conditional actions are used in one output
- referring parameters in sections
2022-07-12 14:51:38 +02:00
Nicola Soranzo d8f123f647 Code cleanups from pyupgrade
Found by running:

```
ack --type=python -f | grep -v '^tools/' | xargs pyupgrade --py37-plus
```
2022-07-12 13:40:36 +01:00
Nicola Soranzo 1e122858ab Merge branch 'release_22.05' into dev 2022-07-11 13:46:43 +01:00
Nicola Soranzo 9a08a76ac0 Merge pull request #14284 from mvdbeek/fix_json_encoding_things 2022-07-10 17:57:06 +01:00
John Davis 1f3849bd1f Rename test 2022-07-08 13:41:40 -04:00
mvdbeek 73c73e0822 Test Decimal/inf/nan value dumping 2022-07-08 19:39:38 +03:00
Nicola Soranzo d4d3485b72 Fix mypy reexport error for testfixtures
Fix this mypy error for the galaxy-app package:

```
tests/app/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py:5: error:
Module "testfixtures" does not explicitly export attribute "log_capture";
implicit reexport disabled  [attr-defined]
    from testfixtures import log_capture
    ^
```
2022-07-08 02:33:28 +01:00
Nicola Soranzo 9b6b272b45 Fix mypy reexport error for testfixtures
Fix this mypy error for the galaxy-app package:

```
tests/app/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py:5: error:
Module "testfixtures" does not explicitly export attribute "log_capture";
implicit reexport disabled  [attr-defined]
    from testfixtures import log_capture
    ^
```
2022-07-06 13:48:46 +01:00
Nicola Soranzo cdaa23cea6 Merge branch 'release_22.05' into dev 2022-07-06 11:47:54 +01:00
John Chilton 613b078892 Merge pull request #14260 from nsoranzo/fix_B023_warnings
Fix B023 warnings from flake8-bugbear 22.7.1
2022-07-05 20:06:38 -04:00
Evan Bolyen 184f0d8eaf TST: fix qiime2.tabular auto-upload test 2022-07-05 09:43:30 -07:00
Evan Bolyen 9c06e232e1 lint: make format is neat 2022-07-05 09:43:30 -07:00
Evan Bolyen 88fed0ffff TST: added more tests 2022-07-05 09:43:30 -07:00
Oddant1 38b1bfc417 QIIME 2: Strip properties from semantic types (#2) 2022-07-05 09:43:30 -07:00
John Chilton 1edee72ce2 Rework uses_shed... 2022-07-05 13:43:04 +01:00
Nicola Soranzo a382eacc58 Fix B023 warnings from flake8-bugbear 22.7.1
The new flake8-bugbear 22.7.1 warns if a function defined inside a loop uses
a variable redefined in the loop, due to the late-binding closure gotcha:
https://docs.python-guide.org/writing/gotchas/#late-binding-closures

When possible/sensible, I've moved the function definition before the loop
(adding the variable(s) as parameters) which is clearly also a speed-up.

Most other cases are false alarms, e.g. if the function is used and
discarded within the loop iteration that defines it. In such cases, I've
annotated the offending lines with a `# noqa: B023`.

The only file where I've applied the suggested workaround of immediately
binding arguments is in `lib/galaxy/visualization/plugins/config_parser.py`

Also:
- Small refactorings, in particular to `scripts/apply_tags.py`
2022-07-05 12:28:37 +01:00
Nicola Soranzo 192e2f751c Relocate dynamic outputs for CWL jobs
Add command to run a relocate script to the `build_command()` function.

Also update the `handle_outputs()` function (used by the relocate script)
to now use a CWL-specific `params.json` file, since the one created by
`setup_external_metadata()` is not yet available to the relocate script
if the metadata is set within a celery task.
2022-07-04 03:29:57 +01:00
Nicola Soranzo 421bccc3ed Add type annotations
Shuffle code around in lib/galaxy/tool_util/cwl/parser.py to allow
type annotations.
2022-07-04 03:29:56 +01:00
mvdbeek 0a8eb4d711 Merge branch 'release_22.05' into dev 2022-07-02 18:32:28 +02:00
mvdbeek 22f761aa10 Fix validation of nested element fetch data payloads
Fixes https://github.com/galaxyproject/galaxy/issues/14242
2022-07-01 13:52:06 +02:00
Dannon Baker 93be80c919 Merge remote-tracking branch 'upstream/release_22.05' into dev 2022-07-01 07:48:10 -04:00
Nicola Soranzo 7466ab89a6 Move `uses_shed.py to galaxy_test.driver`
to break circular dependency between galaxy-test-base and
galaxy-test-driver packages.

Also:
- Use f-string.
2022-06-28 18:33:05 +01:00
David López e1f44769b5 Merge pull request #14137 from jmchilton/job_files_tests
Add some integration tests for the job files API.
2022-06-27 21:58:28 +02:00