Revert "fix(bug): fix the TimeoutError in Python 3.11 and add CI for …

…Python==…" This reverts commit 3711257.
CederGroupHub · Oct 7, 2024 · e133c42 · e133c42
1 parent 3711257
commit e133c42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10"]
     services:
       rabbitmq:
         image: "rabbitmq:3.9"

diff --git a/alab_management/resource_manager/resource_requester.py b/alab_management/resource_manager/resource_requester.py
@@ -34,18 +34,12 @@ class RequestCanceledError(Exception):
     """Request Canceled Error."""
 
 
-# considering concurrent.futures.TimeoutError and TimeoutError becomes the same
-# from Python 3.11. We should determine the base class of this exception.
-if isinstance(concurrent.futures.TimeoutError, TimeoutError):
-    CombinedTimeoutError = TimeoutError
-else:
-
-    class CombinedTimeoutError(TimeoutError, concurrent.futures.TimeoutError):
-        """
-        Combined TimeoutError.
+class CombinedTimeoutError(TimeoutError, concurrent.futures.TimeoutError):
+    """
+    Combined TimeoutError.
 
-        If you catch either TimeoutError or concurrent.futures.TimeoutError, this will catch both.
-        """
+    If you catch either TimeoutError or concurrent.futures.TimeoutError, this will catch both.
+    """
 
 
 class DeviceRequest(BaseModel):