Merge branch 'main' into feature/#409-Doc-link-&-checks

Author: Jannis-Mittenzwei

doc/changes/unreleased.md

@@ -30,5 +30,8 @@ We recommend the following values be added:
 ## ✨ Features
 * #409: Doc link & checks
 
+## Refactoring
+* Switched deprecated Pydantic class-based `config` to `ConfigDict`
+
 ## Security
-* #477: Switched `sonar:check` to use `SONAR_TOKEN` from the environment
+* #477: Switched `sonar:check` to use `SONAR_TOKEN` from the environment

exasol/toolbox/util/dependencies/poetry_dependencies.py

@@ -1,37 +1,33 @@
 from __future__ import annotations
 
-import re
 import subprocess
-import sys
 from pathlib import Path
 from typing import Optional
 
 import tomlkit
 from pydantic import (
     BaseModel,
+    ConfigDict,
 )
 from tomlkit import TOMLDocument
 
 from exasol.toolbox.util.dependencies.shared_models import Package
 
 
 class PoetryGroup(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
     name: str
     toml_section: Optional[str]
 
-    class Config:
-        frozen = True
-
 
 TRANSITIVE_GROUP = PoetryGroup(name="transitive", toml_section=None)
 
 
 class PoetryToml(BaseModel):
-    content: TOMLDocument
+    model_config = ConfigDict(frozen=True, arbitrary_types_allowed=True)
 
-    class Config:
-        frozen = True
-        arbitrary_types_allowed = True
+    content: TOMLDocument
 
     @classmethod
     def load_from_toml(cls, working_directory: Path) -> PoetryToml:

exasol/toolbox/util/dependencies/shared_models.py

@@ -3,18 +3,17 @@
 from packaging.version import Version
 from pydantic import (
     BaseModel,
+    ConfigDict,
     field_validator,
 )
 
 
 class Package(BaseModel):
+    model_config = ConfigDict(frozen=True, arbitrary_types_allowed=True)
+
     name: str
     version: Version
 
-    class Config:
-        frozen = True
-        arbitrary_types_allowed = True
-
     @field_validator("version", mode="before")
     def convert_version(cls, v: str) -> Version:
         return Version(v)