diff --git a/tardis/adapters/sites/moab.py b/tardis/adapters/sites/moab.py index 08935a73..7b8be895 100644 --- a/tardis/adapters/sites/moab.py +++ b/tardis/adapters/sites/moab.py @@ -11,13 +11,13 @@ from ...utilities.asynccachemap import AsyncCacheMap from ...utilities.utils import submit_cmd_option_formatter -from pydantic import PositiveInt, root_validator +from pydantic import PositiveInt from asyncio import TimeoutError from contextlib import contextmanager from functools import partial from datetime import datetime -from typing import Any, Dict, Optional +from typing import Optional import asyncssh import logging @@ -57,15 +57,7 @@ class MoabAdapterConfigurationModel(SiteAdapterBaseModel): executor: Optional[Executor] = ShellExecutor() StatusUpdate: PositiveInt - StartupCommand: Optional[str] = None - - @root_validator(allow_reuse=True) - def deprecate_startup_command( - cls, valuesDict: [str, Any] # noqa B902 - ) -> Dict[str, Any]: - if valuesDict["StartupCommand"] is None: - del valuesDict["StartupCommand"] - return valuesDict + StartupCommand: Optional[str] class MoabAdapter(SiteAdapter): @@ -77,7 +69,7 @@ def __init__(self, machine_type: str, site_name: str): try: self._startup_command = self.machine_type_configuration.StartupCommand except AttributeError: - if not hasattr(self.configuration, "StartupCommand"): + if self.configuration.StartupCommand is None: raise warnings.warn( "StartupCommand has been moved to the machine_type_configuration!", diff --git a/tardis/adapters/sites/slurm.py b/tardis/adapters/sites/slurm.py index 15992df1..854518e9 100644 --- a/tardis/adapters/sites/slurm.py +++ b/tardis/adapters/sites/slurm.py @@ -11,13 +11,13 @@ from ...utilities.asynccachemap import AsyncCacheMap from ...utilities.utils import convert_to, csv_parser, submit_cmd_option_formatter -from pydantic import PositiveInt, root_validator +from pydantic import PositiveInt from asyncio import TimeoutError from contextlib import contextmanager from functools import partial from datetime import datetime -from typing import Any, Dict, Optional +from typing import Optional import logging import re @@ -55,15 +55,7 @@ class SlurmAdapterConfigurationModel(SiteAdapterBaseModel): executor: Optional[Executor] = ShellExecutor() StatusUpdate: PositiveInt - StartupCommand: Optional[str] = None - - @root_validator(allow_reuse=True) - def deprecate_startup_command( - cls, valuesDict: [str, Any] # noqa B902 - ) -> Dict[str, Any]: - if valuesDict["StartupCommand"] is None: - del valuesDict["StartupCommand"] - return valuesDict + StartupCommand: Optional[str] class SlurmAdapter(SiteAdapter): @@ -75,7 +67,7 @@ def __init__(self, machine_type: str, site_name: str): try: self._startup_command = self.machine_type_configuration.StartupCommand except AttributeError: - if not hasattr(self.configuration, "StartupCommand"): + if self.configuration.StartupCommand is None: raise warnings.warn( "StartupCommand has been moved to the machine_type_configuration!",