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

…3.11. The bug is described in #79
CederGroupHub · Oct 7, 2024 · b46f013 · b46f013
1 parent 63dc41b
commit b46f013
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 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"]
+        python-version: ["3.10", "3.11"]
     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,12 +34,18 @@ class RequestCanceledError(Exception):
     """Request Canceled Error."""
 
 
-class CombinedTimeoutError(TimeoutError, concurrent.futures.TimeoutError):
-    """
-    Combined TimeoutError.
+# 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:
 
-    If you catch either TimeoutError or concurrent.futures.TimeoutError, this will catch both.
-    """
+    class CombinedTimeoutError(TimeoutError, concurrent.futures.TimeoutError):
+        """
+        Combined TimeoutError.
+
+        If you catch either TimeoutError or concurrent.futures.TimeoutError, this will catch both.
+        """
 
 
 class DeviceRequest(BaseModel):