Merge pull request #464 from ExaWorks/fix-typeguard-version

typeguard update

Author: hategan

requirements.txt

@@ -1,5 +1,5 @@
 psutil~=5.9
 pystache>=0.6.0
-typeguard~=2.12
+typeguard>=3.0.1
 typing-compat
 packaging~=24.0

src/psij/job_attributes.py

@@ -3,7 +3,7 @@
 from datetime import timedelta
 from typing import Optional, Dict
 
-from typeguard import check_argument_types
+from typeguard import typechecked
 
 
 logger = logging.getLogger(__name__)
@@ -16,6 +16,7 @@
 class JobAttributes(object):
     """A class containing ancillary job information that describes how a job is to be run."""
 
+    @typechecked
     def __init__(self, duration: timedelta = timedelta(minutes=10),
                  queue_name: Optional[str] = None, account: Optional[str] = None,
                  reservation_id: Optional[str] = None,
@@ -49,8 +50,6 @@ def __init__(self, duration: timedelta = timedelta(minutes=10),
 
         All constructor parameters are accessible as properties.
         """
-        assert check_argument_types()
-
         self.account = account
         self.duration = duration
         self.queue_name = queue_name

src/psij/job_spec.py

@@ -5,7 +5,7 @@
 import pathlib
 from typing import Dict, List, Optional, Union
 
-from typeguard import check_argument_types
+from typeguard import typechecked
 
 import psij.resource_spec
 import psij.job_attributes
@@ -36,6 +36,7 @@ def _to_env_dict(arg: Union[Dict[str, Union[str, int]], None]) -> Optional[Dict[
 class JobSpec(object):
     """A class that describes the details of a job."""
 
+    @typechecked
     def __init__(self, executable: Optional[str] = None, arguments: Optional[List[str]] = None,
                  # For some odd reason, and only in the constructor, if Path is used directly,
                  # sphinx fails to find the class. Using Path in the getters and setters does not
@@ -129,8 +130,6 @@ def __init__(self, executable: Optional[str] = None, arguments: Optional[List[st
             the scheduler. In such a case, one must leave the `spec.directory` attribute empty and
             refer to files inside the job directory using relative paths.
         """
-        assert check_argument_types()
-
         self._name = name
         self.executable = executable
         self.arguments = arguments

src/psij/resource_spec.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional, List
 
-from typeguard import check_argument_types
+from typeguard import typechecked
 
 from psij.exceptions import InvalidJobException
 
@@ -45,6 +45,7 @@ def get_instance(version: int) -> 'ResourceSpec':
             raise ValueError()
 
 
+@typechecked
 class ResourceSpecV1(ResourceSpec):
     """This class implements V1 of the PSI/J resource specification."""
 
@@ -81,8 +82,6 @@ def __init__(self, node_count: Optional[int] = None,
 
         All constructor parameters are accessible as properties.
         """
-        assert check_argument_types()
-
         self.node_count = node_count
         self.process_count = process_count
         self.processes_per_node = processes_per_node

tests/test_job_spec.py

@@ -1,6 +1,8 @@
 import os
 from pathlib import Path
 
+from typeguard import suppress_type_checks
+
 import pytest
 
 from psij import Job, JobExecutor, JobSpec
@@ -13,8 +15,9 @@ def _test_spec(spec: JobSpec) -> None:
 
 def test_environment_types() -> None:
 
-    with pytest.raises(TypeError):
-        _test_spec(JobSpec(executable='true', environment={1: 'foo'}))  # type: ignore
+    with suppress_type_checks():
+        with pytest.raises(TypeError):
+            _test_spec(JobSpec(executable='true', environment={1: 'foo'}))  # type: ignore
 
     with pytest.raises(TypeError):
         spec = JobSpec(executable='true')