Allow reuse of validators to make python3.8 happy

MatterMiners · Feb 28, 2022 · 856a6e7 · 856a6e7
1 parent 96d4cc1
commit 856a6e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tardis/adapters/sites/moab.py b/tardis/adapters/sites/moab.py
@@ -59,7 +59,7 @@ class MoabAdapterConfigurationModel(SiteAdapterBaseModel):
     StatusUpdate: PositiveInt
     StartupCommand: Optional[str] = None
 
-    @root_validator()
+    @root_validator(allow_reuse=True)
     def deprecate_startup_command(
         cls, valuesDict: [str, Any]  # noqa B902
     ) -> Dict[str, Any]:

diff --git a/tardis/adapters/sites/slurm.py b/tardis/adapters/sites/slurm.py
@@ -57,7 +57,7 @@ class SlurmAdapterConfigurationModel(SiteAdapterBaseModel):
     StatusUpdate: PositiveInt
     StartupCommand: Optional[str] = None
 
-    @root_validator()
+    @root_validator(allow_reuse=True)
     def deprecate_startup_command(
         cls, valuesDict: [str, Any]  # noqa B902
     ) -> Dict[str, Any]:

diff --git a/tardis/interfaces/siteadapter.py b/tardis/interfaces/siteadapter.py
@@ -27,7 +27,9 @@ class SiteAdapterBaseModel(BaseModel):
     class Config:
         arbitrary_types_allowed = True
 
-    @root_validator(skip_on_failure=True)  # skip if previous validator failed
+    @root_validator(
+        skip_on_failure=True, allow_reuse=True
+    )  # skip if previous validator failed
     def validate(cls, values: Dict[str, Any]) -> Dict[str, Any]:  # noqa B902
         """
         Validate that MachineTypeConfiguration and MachineMetaData is available