Skip to content

Commit 31720da

Browse files
committed
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 ```
1 parent 13eeda3 commit 31720da

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

lib/galaxy/files/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ class FilesSourceProperties(StrictModel):
251251
supports: Annotated[
252252
FileSourceSupports,
253253
Field(
254-
default_factory=FileSourceSupports,
255254
description="Features supported by this file source.",
256255
),
257256
] = FileSourceSupports()

0 commit comments

Comments
 (0)