chore(deps)!: update to openjd-sessions 0.10.* (#558)

Updates the requirements on [openjd-sessions](https://github.com/OpenJobDescription/openjd-sessions-for-python) to permit the latest version.
- [Release notes](https://github.com/OpenJobDescription/openjd-sessions-for-python/releases)
- [Changelog](https://github.com/OpenJobDescription/openjd-sessions-for-python/blob/mainline/CHANGELOG.md)
- [Commits](OpenJobDescription/[email protected])

BREAKING CHANGE: A defect was fixed in the OpenJobDescription specification (OpenJobDescription/openjd-specifications#70) which causes a breaking change to Worker Agent behaviour. Environment exits previously had no default timeout and they now have a default timeout of 5 minutes. To have long-running environment exit actions, job templates can specify a large timeout value when defining environment exit actions in a job or environment template.

Signed-off-by: Charles Moore <[email protected]>

pyproject.toml

@@ -14,13 +14,13 @@ dependencies = [
     "requests ~= 2.31",
     "boto3 >= 1.34.75",
     "deadline == 0.49.*",
-    "openjd-sessions >= 0.9.0,< 0.10",
+    "openjd-sessions == 0.10.*",
     # tomli became tomllib in standard library in Python 3.11
     "tomli == 2.0.* ; python_version<'3.11'",
     "tomlkit == 0.13.*",
     "typing_extensions ~= 4.8",
     "psutil >= 5.9,< 8.0",
-    "pydantic ~= 1.10.0",
+    "pydantic >= 2.10, < 3",
     "pywin32 == 308; platform_system == 'Windows'",
     "requests == 2.32.*",
 ]
@@ -100,7 +100,8 @@ pretty = true
 
 # Declare mypy plugins
 plugins = [
-    "pydantic.mypy",
+  "pydantic.mypy",
+  "pydantic.v1.mypy"
 ]
 
 files = [ "src/**/*.py" ]
@@ -111,7 +112,6 @@ ignore_missing_imports = true
 # Ignore missing type annotations for the following packages
 # See https://mypy.readthedocs.io/en/stable/config_file.html#using-a-pyproject-toml-file
 [[tool.mypy.overrides]]
-
 module = [
     "requests",
     "requests.exceptions",

src/deadline_worker_agent/capabilities.py

@@ -11,13 +11,13 @@
 import shutil
 import subprocess
 
-from pydantic import BaseModel, NonNegativeFloat, PositiveFloat
+from pydantic.v1 import BaseModel, NonNegativeFloat, PositiveFloat
 import psutil
 
 from .config.errors import ConfigurationError
 
 if TYPE_CHECKING:
-    from pydantic.typing import CallableGenerator
+    from pydantic.v1.typing import CallableGenerator
 
 
 _logger = logging.getLogger(__name__)

src/deadline_worker_agent/config/config.py

@@ -10,7 +10,7 @@
 from pathlib import Path
 from typing import Any, Optional, Sequence, Tuple, cast, TYPE_CHECKING
 
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from openjd.sessions import PosixSessionUser, SessionUser
 

src/deadline_worker_agent/config/config_file.py

@@ -10,7 +10,7 @@
 import os
 
 import tomlkit
-from pydantic import BaseModel, BaseSettings, Field, ValidationError, root_validator, StrictStr
+from pydantic.v1 import BaseModel, BaseSettings, Field, ValidationError, root_validator, StrictStr
 from tomlkit.container import Container
 from tomlkit.items import Bool, Comment, SingleKey, String, Table, Trivia, Whitespace
 

src/deadline_worker_agent/config/settings.py

@@ -5,8 +5,8 @@
 from typing import Optional, Tuple
 from pathlib import Path
 
-from pydantic import BaseSettings, Field
-from pydantic.env_settings import SettingsSourceCallable
+from pydantic.v1 import BaseSettings, Field
+from pydantic.v1.env_settings import SettingsSourceCallable
 
 from ..capabilities import Capabilities
 from .config_file import ConfigFile

test/unit/config/test_config_file.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from deadline_worker_agent.capabilities import Capabilities
 
-from pydantic import ValidationError, BaseSettings
+from pydantic.v1 import ValidationError, BaseSettings
 import pytest
 
 try:

test/unit/config/test_settings.py

@@ -9,7 +9,7 @@
 import os
 from pathlib import Path
 
-from pydantic import ConstrainedStr
+from pydantic.v1 import ConstrainedStr
 
 import deadline_worker_agent.config.settings as settings_mod
 from deadline_worker_agent.capabilities import Capabilities

test/unit/test_capabilities.py

@@ -7,7 +7,7 @@
 import pytest
 import subprocess
 
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from deadline_worker_agent.capabilities import Capabilities
 from deadline_worker_agent import capabilities as capabilities_mod