creating a type union with the pipe operator is not support by threading.Lock

until Python 3.13

python/cpython#114315 fixed in 3.13 python/cpython@d96358f

Author: mr-c

cwltool/command_line_tool.py

@@ -179,7 +179,7 @@ def __init__(
     def run(
         self,
         runtimeContext: RuntimeContext,
-        tmpdir_lock: threading.Lock | None = None,
+        tmpdir_lock: Union[threading.Lock, None] = None,
     ) -> None:
         try:
             normalizeFilesDirs(self.builder.job)
@@ -329,7 +329,7 @@ def __init__(
     def run(
         self,
         runtimeContext: RuntimeContext,
-        tmpdir_lock: threading.Lock | None = None,
+        tmpdir_lock: Union[threading.Lock, None] = None,
     ) -> None:
         if self.output_callback:
             self.output_callback(

cwltool/context.py

@@ -180,7 +180,7 @@ def __init__(self, kwargs: dict[str, Any] | None = None) -> None:
         self.cidfile_dir: str | None = None
         self.cidfile_prefix: str | None = None
 
-        self.workflow_eval_lock: threading.Condition | None = None
+        self.workflow_eval_lock: Union[threading.Condition, None] = None
         self.research_obj: ResearchObject | None = None
         self.orcid: str = ""
         self.cwl_full_name: str = ""

cwltool/job.py

@@ -161,7 +161,8 @@ def __repr__(self) -> str:
     def run(
         self,
         runtimeContext: RuntimeContext,
-        tmpdir_lock: threading.Lock | None = None,
+        tmpdir_lock: Union[threading.Lock, None] = None,
+        # use `threading.Lock | None` when we drop support for Python 3.12
     ) -> None:
         pass
 
@@ -566,7 +567,7 @@ class CommandLineJob(JobBase):
     def run(
         self,
         runtimeContext: RuntimeContext,
-        tmpdir_lock: threading.Lock | None = None,
+        tmpdir_lock: Union[threading.Lock, None] = None,
     ) -> None:
         if tmpdir_lock:
             with tmpdir_lock:
@@ -752,7 +753,7 @@ def add_volumes(
     def run(
         self,
         runtimeContext: RuntimeContext,
-        tmpdir_lock: threading.Lock | None = None,
+        tmpdir_lock: Union[threading.Lock, None] = None,
     ) -> None:
         debug = runtimeContext.debug
         if tmpdir_lock:

cwltool/task_queue.py

@@ -6,6 +6,7 @@
 import queue
 import threading
 from collections.abc import Callable
+from typing import Union
 
 from .loghandler import _logger
 
@@ -65,8 +66,8 @@ def _task_queue_func(self) -> None:
     def add(
         self,
         task: Callable[[], None],
-        unlock: threading.Condition | None = None,
-        check_done: threading.Event | None = None,
+        unlock: Union[threading.Condition, None] = None,
+        check_done: Union[threading.Event, None] = None,
     ) -> None:
         """
         Add your task to the queue.

cwltool/workflow_job.py

@@ -4,7 +4,7 @@
 import logging
 import threading
 from collections.abc import MutableMapping, MutableSequence, Sized
-from typing import Optional, TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Optional, Union, cast
 
 from cwl_utils import expression
 from cwl_utils.types import CWLObjectType, CWLOutputType, SinkType
@@ -764,7 +764,7 @@ def valueFromFunc(k: str, v: CWLOutputType | None) -> CWLOutputType | None:
     def run(
         self,
         runtimeContext: RuntimeContext,
-        tmpdir_lock: threading.Lock | None = None,
+        tmpdir_lock: Union[threading.Lock, None] = None,
     ) -> None:
         """Log the start of each workflow."""
         _logger.info("[%s] start", self.name)