Commit Graph
86624 Commits
Author SHA1 Message Date
guerler 775ab8b152 Fix parsing user id to preferences 2026-01-15 10:01:06 +03:00
David López 4df310d4ed Merge pull request #21569 from davelopez/25.1_dataverse_fixes
[25.1] Supports Dataverse file access via both persistent and database IDs
2026-01-14 13:58:50 +01:00
davelopez 86c2533fdc Supports Dataverse file access via both persistent and database IDs
Improves Dataverse integration by handling file access for instances where FilePIDsEnabled is false and files use database IDs instead of persistent IDs.
Enhances path parsing, access URL construction, plugin URI generation, and file listing to robustly differentiate between persistent and database identifiers.
Refines error handling for authentication and not-found scenarios to improve reliability and clarity.
2026-01-13 15:06:33 +01:00
Nicola Soranzo a360903a70 Merge pull request #21557 from mvdbeek/fix_pulsar_rewrite_parameters_false
[25.1] Fix pulsar with ``rewrite_parameters: false``
2026-01-13 02:19:43 +00:00
Marius van den Beek 41b8531b72 Merge pull request #21560 from mvdbeek/dataset-expiration-hover
[25.1] Show "Expires today" instead of "Expires soon" in Expiration Warning
2026-01-12 19:42:28 +01:00
Nicola Soranzo ce140f3e73 Use StrPath type 2026-01-12 19:16:43 +01:00
Marius van den Beek 31f92eb079 Merge pull request #21558 from mvdbeek/replacement_fix
[25.1] Fix job cache collection copy
2026-01-12 17:40:39 +01:00
mvdbeek 0024357360 Fix content expiration indicator to show "Expires today" instead of "Expires soon"
- Change "Expires soon!" to "Expires today" when less than 1 day remains
- Add proper singular handling ("Expires in 1 day" instead of "1 days")
- Show full date and time in tooltip using toLocaleString() instead of just
  the date, so users can see the exact expiration time in their local timezone

Fixes https://github.com/galaxyproject/galaxy/issues/21559
2026-01-12 16:35:55 +01:00
mvdbeek 3639edb459 Fix pulsar with `rewrite_parameters: false`
And add type hints that would have caught this.
Fixes https://github.com/galaxyproject/galaxy/issues/21555
2026-01-12 16:28:28 +01:00
mvdbeek 30db9fac56 Fix job cache collection copy 2026-01-12 15:55:08 +01:00
mvdbeek 96d6df1170 Add regression test for Error with job cache #21556 2026-01-12 15:55:08 +01:00
Marius van den Beek 894e4c685e Merge pull request #21531 from bgruening/new_jup
[25.1] Add new jupter version
2026-01-12 12:41:22 +01:00
Marius van den Beek 12943a2ff6 Merge pull request #21544 from mvdbeek/claude/filter-failed-hda-cache-nIi9o
[25.1] Filter out failed_metadata HDAs from job cache
2026-01-10 09:18:32 +02:00
mvdbeek 62e8470606 Refactor to decrease duplication 2026-01-09 11:44:41 +01:00
David López f2e63cdbd5 Merge pull request #21547 from davelopez/25.1_add_expiration_sample
[25.1] Adds object_expires_after_days example usage to sample config
2026-01-08 18:11:20 +01:00
David LópezandLucille Delisle 1494389445 Clarify comment about how expired data is deleted
Co-authored-by: Lucille Delisle <lucille.delisle@unige.ch>
2026-01-08 11:01:46 +01:00
davelopez b877e8a74d Adds object_expires_after_days example usage to sample config 2026-01-08 10:40:05 +01:00
mvdbeek 243de11fa1 Filter out failed_metadata HDAs from job cache
HDAs where _state is set (indicating failed_metadata or setting_metadata)
were not being filtered out when looking for cached jobs. This change adds
checks to require _state to be NULL (which indicates metadata is OK) in the
following cache lookup methods:

- _build_stmt_for_hda: filters the requested input HDA
- _build_stmt_for_hdca: filters leaf HDAs in the reference collection
- _build_stmt_for_dce: filters leaf HDAs in both collection and direct
  HDA cases

Also adds integration tests to verify that job cache lookups correctly
exclude HDAs and HDCA elements in failed_metadata state.
2026-01-07 19:19:55 +01:00
John Chilton 664ada17a6 Merge pull request #21520 from mvdbeek/cleanup_integration_instance
[25.1] Improve tempdir cleanup in integration tests
2026-01-06 09:37:03 -05:00
Bjoern Gruening 1805f26df8 add new jupter version 2026-01-04 11:36:24 +01:00
mvdbeek 77d953c628 Move more setup code into handle_galaxy_config_kwds which has test_driver configured 2026-01-01 15:08:26 +01:00
mvdbeek 415e5feb58 Use test_driver.mkdtemp systematically
This might help with integration tests filling up the disk.
This was mostly fine before but this is a nice abstraction.
2026-01-01 15:08:26 +01:00
mvdbeek 5c1e94dfd0 Avoid undefined variable error 2026-01-01 13:34:25 +01:00
John Chilton d3bf550f1e Merge pull request #21518 from nsoranzo/release_25.1_backports
[25.1] Add missing dependencies to ``galaxy-files`` package
2025-12-31 12:15:57 -05:00
Nicola Soranzo 07228ab9e4 Add missing dependencies to galaxy-files package
xref: https://github.com/bioconda/bioconda-recipes/pull/61435/changes

Also:
- Sync pydantic minimum version across all packages that require it.
2025-12-30 23:49:35 +00:00
Nicola Soranzo 48436be11c Fix for pydantic 2.12.0
Fix the following error at Galaxy startup:

```
Traceback (most recent call last):
  File "/opt/hostedtoolcache/Python/3.9.23/x64/lib/python3.9/logging/config.py", line 543, in configure
    formatters[name] = self.configure_formatter(
  File "/opt/hostedtoolcache/Python/3.9.23/x64/lib/python3.9/logging/config.py", line 655, in configure_formatter
    result = self.configure_custom(config)
  File "/opt/hostedtoolcache/Python/3.9.23/x64/lib/python3.9/logging/config.py", line 470, in configure_custom
    c = self.resolve(c)
  File "/opt/hostedtoolcache/Python/3.9.23/x64/lib/python3.9/logging/config.py", line 391, in resolve
    self.importer(used)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/web_stack/__init__.py", line 13, in <module>
    from galaxy.model import database_utils
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/__init__.py", line 144, in <module>
    from galaxy.files.templates import (
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/files/__init__.py", line 13, in <module>
    from galaxy.files.sources import (
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/files/sources/__init__.py", line 19, in <module>
    from galaxy.files.models import (
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/files/models.py", line 135, in <module>
    class FilesSourceProperties(StrictModel):
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.9/site-packages/pydantic/_internal/_model_construction.py", line 242, in __new__
    set_model_fields(cls, config_wrapper=config_wrapper, ns_resolver=ns_resolver)
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.9/site-packages/pydantic/_internal/_model_construction.py", line 566, in set_model_fields
    fields, class_vars = collect_model_fields(cls, config_wrapper, ns_resolver, typevars_map=typevars_map)
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.9/site-packages/pydantic/_internal/_fields.py", line 364, in collect_model_fields
    field_info = FieldInfo_.from_annotated_attribute(ann_type, assigned_value, _source=AnnotationSource.CLASS)
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.9/site-packages/pydantic/fields.py", line 443, in from_annotated_attribute
    field_info = FieldInfo._construct(
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.9/site-packages/pydantic/fields.py", line 519, in _construct
    merged_field_info = cls(**merged_kwargs)
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.9/site-packages/pydantic/fields.py", line 232, in __init__
Error:     raise TypeError('cannot specify both default and default_factory')
TypeError: cannot specify both default and default_factory
```
2025-12-30 23:41:48 +00:00
Dannon Baker d4e1ba75be Fix mypy error for npz.zip.filelist optional access 2025-12-30 23:40:34 +00:00
mvdbeek 174240b71d Merge branch 'release_25.0' into release_25.1 2025-12-27 12:01:34 +01:00
Marius van den Beek 5fdc8b971b Merge pull request #21508 from mvdbeek/fix_invocation_response_model
[25.0] Fix type annotation for invocation report ``errors`` field
2025-12-27 11:27:02 +01:00
mvdbeek 6f98404eeb Fix errors type and maintain error messsage
Fixes https://github.com/galaxyproject/galaxy/issues/18874
2025-12-25 10:55:59 +01:00
mvdbeek b7a002dcb8 Add invocation report error handling test
Regression test for https://github.com/galaxyproject/galaxy/issues/18874
2025-12-25 10:53:12 +01:00
Nicola Soranzo cc854daa21 Merge pull request #21484 from natefoo/archive-no-update-time
[25.1] Do not update a user's update_time when an admin archives (and purges) a history
2025-12-23 20:17:18 +01:00
Nate CoraorandNicola Soranzo e55e44b27f Update lib/galaxy/webapps/galaxy/services/histories.py
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2025-12-23 10:40:35 -05:00
John Chilton e0a50d0c7b Merge pull request #21503 from jmchilton/restrict_sample_sheet_25_1
[25.1] Usability fixes for sample sheet selection.
2025-12-23 09:38:46 -05:00
John Chilton 6e80bed26a Merge pull request #21504 from jmchilton/fix_hda_exception_message
[25.1] Fix exception message to enable debugging of missing dataset issue.
2025-12-22 14:19:17 -05:00
John Chilton c6c00aec2f Fix client linting. 2025-12-22 14:12:11 -05:00
John Chilton f4bfd3b6d9 25.1 doesn't have this decorator - commit should be reverted on dev merge 2025-12-22 13:29:28 -05:00
John Chilton 29b95e6f62 Fix exception message to enable debugging of missing dataset issue.
xref https://github.com/galaxyproject/galaxy/issues/21255
2025-12-22 11:44:56 -05:00
John Chilton b1be7a05a2 Fix sample sheet select collection build dialog to filter on valid types.
Fixes https://github.com/galaxyproject/galaxy/issues/21206
2025-12-22 11:27:17 -05:00
John ChiltonandClaude Opus 4.5 c9ad0def06 Filter sample sheet collections by column_definitions compatibility
Backend:
- Add column_definitions_compatible() in sample_sheet_util.py
- Filter incompatible collections in match_collections()
- Include column_definitions in HDCA options response

Frontend:
- Add column_definitions to DataOption type
- Check compatibility in canAcceptSrc for drag/drop

Fixes #21472

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-22 11:27:15 -05:00
Nicola Soranzo a98790617e Just run `execute()`
as in the other `if` branch.

Fix:

```
sqlalchemy.exc.InvalidRequestError: A transaction is already begun on this Session.
```
2025-12-19 19:09:10 +00:00
mvdbeek d1edab7ec8 Merge branch 'release_25.0' into release_25.1 2025-12-19 18:10:51 +01:00
Marius van den Beek 8f4744ed60 Merge pull request #21498 from dannon/fix-prebuilt-client-pin
[25.0] Pin release prebuilt client package exactly
2025-12-19 18:09:22 +01:00
Dannon Baker a441679bb3 Pin release prebuilt client package exactly
Otherwise you get 25.1's client here, now that it is published.
2025-12-19 11:45:29 -05:00
John Chilton 9dc202a4ff Merge pull request #21488 from mvdbeek/fix-required-with-default-input
[25.1] Fix subworkflow runs for disconnected required inputs with defaults
2025-12-19 10:33:42 -05:00
John Chilton ccced351ad Merge pull request #21465 from mvdbeek/add_sample_sheet_support_to_many_database_operation_tools
[25.1] Add sample sheet support to many database operation tools
2025-12-19 10:18:48 -05:00
Björn Grüning 7dc87ac85d Merge pull request #21494 from elmedjadjirayane/r25.1
[25.1] change locuszoom package version to 0.0.7
2025-12-19 14:21:08 +01:00
Rayane Elmedjadji 6b42635d98 change locuszoom package version to 0.0.7 2025-12-18 21:19:59 +01:00
John Chilton 21dee459cd Deduplicate history archive test additions 2025-12-18 12:38:55 -05:00
Nicola Soranzo b6d37af910 Fix mypy errors in changes to recalculate_user_disk_usage() 2025-12-18 12:27:31 -05:00