Merge pull request #145 from mvdbeek/modernize_pydantic_v1_syntax

Modernize remaining pydantic v1 syntax to v2

Author: jmchilton

gravity/settings.py

@@ -9,6 +9,7 @@
 import yaml
 from pydantic import (
     BaseModel,
+    ConfigDict,
     Field,
     field_validator,
     ValidationInfo,
@@ -151,8 +152,7 @@ class CelerySettings(BaseModel):
 names.
 """)] = {}
 
-    class Config:
-        use_enum_values = True
+    model_config = ConfigDict(use_enum_values=True)
 
 
 class GunicornSettings(BaseModel):

tests/test_config_manager.py

@@ -29,7 +29,7 @@ def test_load_defaults(galaxy_yml, galaxy_root_dir, state_dir, default_config_ma
     assert gunicorn_settings['extra_args'] == default_settings.gunicorn.extra_args
     assert gunicorn_settings['preload'] is True
     celery_settings = config.get_service('celery').settings
-    assert celery_settings == default_settings.celery.dict()
+    assert celery_settings == default_settings.celery.model_dump()
     with pytest.raises(IndexError):
         config.get_service('tusd')