Skip to content

[25.1] Add missing dependencies to galaxy-files package#21518

Merged
jmchilton merged 3 commits intogalaxyproject:release_25.1from
nsoranzo:release_25.1_backports
Dec 31, 2025
Merged

[25.1] Add missing dependencies to galaxy-files package#21518
jmchilton merged 3 commits intogalaxyproject:release_25.1from
nsoranzo:release_25.1_backports

Conversation

@nsoranzo
Copy link
Copy Markdown
Member

Also:

  • Sync pydantic minimum version across all packages that require it.
  • Backport 2 bug fixes from the dev branch.

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

dannon and others added 3 commits December 30, 2025 23:40
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
```
@nsoranzo
Copy link
Copy Markdown
Member Author

Test failures unrelated.

@jmchilton jmchilton merged commit d3bf550 into galaxyproject:release_25.1 Dec 31, 2025
50 of 54 checks passed
@nsoranzo nsoranzo deleted the release_25.1_backports branch January 1, 2026 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants