Manual lint fixes

dandavison · dandavison · commit 23892f37f1da · 2025-02-21T08:58:17.000-05:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,11 +54,11 @@ dev = [
 [tool.poe.tasks]
 build-develop = "uv run maturin develop --uv"
 build-develop-with-release = { cmd = "uv run maturin develop --release --uv" }
-format = [{cmd = "uv run ruff check --select I --fix"}, {cmd = "uv run ruff format"}, ]
+format = [{cmd = "uv run ruff check --fix"}, {cmd = "uv run ruff format"}, ]
 gen-docs = "uv run python scripts/gen_docs.py"
 gen-protos = "uv run python scripts/gen_protos.py"
 lint = [
-  {cmd = "uv run ruff check --select I"},
+  {cmd = "uv run ruff check"},
   {cmd = "uv run ruff format --check"},
   {ref = "lint-types"},
   {cmd = "uv run pyright"},
@@ -72,6 +72,11 @@ lint-types = "uv run mypy --namespace-packages --check-untyped-defs ."
 run-bench = "uv run python scripts/run_bench.py"
 test = "uv run pytest"
 
+[tool.ruff]
+target-version = "py39"
+exclude = ["*_pb2.py"]
+lint.ignore = ["E741"]
+
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
@@ -183,9 +188,6 @@ exclude = [
   "temporalio/bridge/testing.py",
 ]
 
-[tool.ruff]
-target-version = "py39"
-
 [build-system]
 requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
diff --git a/temporalio/api/cloud/cloudservice/v1/__init__.py b/temporalio/api/cloud/cloudservice/v1/__init__.py
@@ -194,9 +194,9 @@
 
 # gRPC is optional
 try:
-    import grpc
+    import grpc  # noqa # type: ignore
 
-    from .service_pb2_grpc import (
+    from .service_pb2_grpc import (  # noqa: F401
         CloudServiceServicer,
         CloudServiceStub,
         add_CloudServiceServicer_to_server,
diff --git a/temporalio/api/operatorservice/v1/__init__.py b/temporalio/api/operatorservice/v1/__init__.py
@@ -56,9 +56,9 @@
 
 # gRPC is optional
 try:
-    import grpc
+    import grpc  # noqa # type: ignore
 
-    from .service_pb2_grpc import (
+    from .service_pb2_grpc import (  # noqa: F401
         OperatorServiceServicer,
         OperatorServiceStub,
         add_OperatorServiceServicer_to_server,
diff --git a/temporalio/api/testservice/v1/__init__.py b/temporalio/api/testservice/v1/__init__.py
@@ -22,9 +22,9 @@
 
 # gRPC is optional
 try:
-    import grpc
+    import grpc  # noqa # type: ignore
 
-    from .service_pb2_grpc import (
+    from .service_pb2_grpc import (  # noqa: F401
         TestServiceServicer,
         TestServiceStub,
         add_TestServiceServicer_to_server,
diff --git a/temporalio/api/workflowservice/v1/__init__.py b/temporalio/api/workflowservice/v1/__init__.py
@@ -278,9 +278,9 @@
 
 # gRPC is optional
 try:
-    import grpc
+    import grpc  # noqa # type: ignore
 
-    from .service_pb2_grpc import (
+    from .service_pb2_grpc import (  # noqa: F401
         WorkflowServiceServicer,
         WorkflowServiceStub,
         add_WorkflowServiceServicer_to_server,
diff --git a/temporalio/common.py b/temporalio/common.py
@@ -30,7 +30,7 @@
 )
 
 import google.protobuf.internal.containers
-from typing_extensions import ClassVar, NamedTuple, Self, TypeAlias, get_origin
+from typing_extensions import NamedTuple, Self, TypeAlias, get_origin
 
 import temporalio.api.common.v1
 import temporalio.api.enums.v1
diff --git a/temporalio/converter.py b/temporalio/converter.py
@@ -926,7 +926,7 @@ def from_failure(
                     stack_trace = encoded_attributes.get("stack_trace")
                     if isinstance(stack_trace, str):
                         failure.stack_trace = stack_trace
-            except:
+            except Exception:
                 pass
 
         err: temporalio.exceptions.FailureError
diff --git a/temporalio/runtime.py b/temporalio/runtime.py
@@ -207,7 +207,7 @@ def _on_logs(
                 # just in case)
                 try:
                     message += f" {log.fields}"
-                except:
+                except Exception:
                     pass
             record = self.logger.makeRecord(
                 name,
diff --git a/temporalio/testing/_workflow.py b/temporalio/testing/_workflow.py
@@ -215,10 +215,10 @@ async def start_local(
                 ),
                 server,
             )
-        except:
+        except Exception:
             try:
                 await server.shutdown()
-            except:
+            except Exception:
                 logger.warn(
                     "Failed stopping local server on client connection failure",
                     exc_info=True,
@@ -326,10 +326,10 @@ async def start_time_skipping(
                 ),
                 server,
             )
-        except:
+        except Exception:
             try:
                 await server.shutdown()
-            except:
+            except Exception:
                 logger.warn(
                     "Failed stopping test server on client connection failure",
                     exc_info=True,
@@ -474,13 +474,13 @@ async def time_skipping_unlocked(self) -> AsyncIterator[None]:
             await self.client.test_service.lock_time_skipping(
                 temporalio.api.testservice.v1.LockTimeSkippingRequest()
             )
-        except:
+        except Exception:
             # Lock it back, swallowing error
             try:
                 await self.client.test_service.lock_time_skipping(
                     temporalio.api.testservice.v1.LockTimeSkippingRequest()
                 )
-            except:
+            except Exception:
                 logger.exception("Failed locking time skipping after error")
             raise
 
diff --git a/temporalio/worker/_activity.py b/temporalio/worker/_activity.py
@@ -518,7 +518,7 @@ async def _run_activity(
             if running_activity.last_heartbeat_task:
                 try:
                     await running_activity.last_heartbeat_task
-                except:
+                except Exception:
                     # Should never happen because it's trapped in-task
                     temporalio.activity.logger.exception(
                         "Final heartbeat task didn't trap error"
@@ -750,7 +750,7 @@ def _execute_sync_activity(
     if isinstance(heartbeat, SharedHeartbeatSender):
         # To make mypy happy
         heartbeat_sender = heartbeat
-        heartbeat_fn = lambda *details: heartbeat_sender.send_heartbeat(
+        heartbeat_fn = lambda *details: heartbeat_sender.send_heartbeat(  # noqa: E731
             info.task_token, *details
         )
     else:
diff --git a/temporalio/worker/_replayer.py b/temporalio/worker/_replayer.py
@@ -156,7 +156,7 @@ async def workflow_replay_iterator(
             replayed.
         """
         try:
-            last_replay_failure: Optional[Exception]
+            last_replay_failure: Optional[Exception] = None
             last_replay_complete = asyncio.Event()
 
             # Create eviction hook
diff --git a/temporalio/worker/_worker.py b/temporalio/worker/_worker.py
@@ -504,7 +504,7 @@ async def raise_on_shutdown():
                 if self._config["on_fatal_error"]:
                     try:
                         await self._config["on_fatal_error"](exception)
-                    except:
+                    except Exception:
                         logger.warning("Fatal error handler failed")
 
         except asyncio.CancelledError as user_cancel_err:
@@ -560,7 +560,7 @@ async def raise_on_shutdown():
         # Do final shutdown
         try:
             await self._bridge_worker.finalize_shutdown()
-        except:
+        except Exception:
             # Ignore errors here that can arise in some tests where the bridge
             # worker still has a reference
             pass
diff --git a/temporalio/worker/workflow_sandbox/_restrictions.py b/temporalio/worker/workflow_sandbox/_restrictions.py
@@ -933,7 +933,8 @@ def __init__(
 
         def bind_f(instance: _RestrictedProxy, obj: Any) -> Callable:
             def i_op(self: Any, other: Any) -> _RestrictedProxy:
-                f(self, other)  # type: ignore
+                # TODO: wat
+                f(self, other)  # type: ignore # noqa: F821
                 return instance
 
             return i_op.__get__(obj, type(obj))  # type: ignore
diff --git a/temporalio/workflow.py b/temporalio/workflow.py
@@ -1660,8 +1660,8 @@ def _assert_dynamic_handler_args(
     if (
         not arg_types
         or len(arg_types) != 2
-        or arg_types[0] != str
-        or arg_types[1] != Sequence[temporalio.common.RawValue]
+        or arg_types[0] is not str
+        or arg_types[1] is not Sequence[temporalio.common.RawValue]
     ):
         raise RuntimeError(
             "Dynamic handler must have 3 arguments: self, str, and Sequence[temporalio.common.RawValue]"
@@ -4273,7 +4273,7 @@ class ContinueAsNewError(BaseException):
 
     def __init__(self, *args: object) -> None:
         """Direct instantiation is disabled. Use :py:func:`continue_as_new`."""
-        if type(self) == ContinueAsNewError:
+        if type(self) is ContinueAsNewError:
             raise RuntimeError("Cannot instantiate ContinueAsNewError directly")
         super().__init__(*args)
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -25,6 +25,10 @@
 # Unless specifically overridden, we expect tests to run under protobuf 4.x/5.x lib
 import google.protobuf
 
+from temporalio.client import Client
+from temporalio.testing import WorkflowEnvironment
+from tests.helpers.worker import ExternalPythonWorker, ExternalWorker
+
 protobuf_version = google.protobuf.__version__
 if os.getenv("TEMPORAL_TEST_PROTO3"):
     assert protobuf_version.startswith(
@@ -35,10 +39,6 @@
         "5."
     ), f"Expected protobuf 4.x/5.x, got {protobuf_version}"
 
-from temporalio.client import Client
-from temporalio.testing import WorkflowEnvironment
-from tests.helpers.worker import ExternalPythonWorker, ExternalWorker
-
 
 def pytest_addoption(parser):
     parser.addoption(
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -381,7 +381,7 @@ async def test_query(client: Client, worker: ExternalWorker):
     await handle.result()
     assert "some query arg" == await handle.query("some query", "some query arg")
     # Try a query not on the workflow
-    with pytest.raises(WorkflowQueryFailedError) as err:
+    with pytest.raises(WorkflowQueryFailedError):
         await handle.query("does not exist")
 
 
diff --git a/tests/testing/test_activity.py b/tests/testing/test_activity.py
@@ -68,7 +68,7 @@ def via_thread():
                     while not activity.is_cancelled():
                         time.sleep(0.2)
                     time.sleep(0.2)
-                except:
+                except Exception:
                     raise RuntimeError("Unexpected")
         except CancelledError:
             nonlocal properly_cancelled
@@ -108,5 +108,5 @@ async def assert_equals(a: str, b: str) -> None:
     except Exception as err:
         actual_err = err
 
-    assert type(expected_err) == type(actual_err)
+    assert type(expected_err) is type(actual_err)
     assert str(expected_err) == str(actual_err)
diff --git a/tests/worker/test_activity.py b/tests/worker/test_activity.py
@@ -589,7 +589,7 @@ class SomeClass2:
 
 
 async def test_activity_type_hints(client: Client, worker: ExternalWorker):
-    activity_param1: SomeClass2
+    activity_param1: Optional[SomeClass2] = None
 
     @activity.defn
     async def some_activity(param1: SomeClass2, param2: str) -> str:
diff --git a/tests/worker/test_workflow.py b/tests/worker/test_workflow.py
@@ -52,8 +52,6 @@
 from temporalio.bridge.proto.workflow_completion import WorkflowActivationCompletion
 from temporalio.client import (
     Client,
-    RPCError,
-    RPCStatusCode,
     WorkflowExecutionStatus,
     WorkflowFailureError,
     WorkflowHandle,
@@ -2184,7 +2182,7 @@ async def status() -> str:
         # Send stack trace query
         trace = await handle.query("__enhanced_stack_trace")
 
-        assert type(trace) == EnhancedStackTrace
+        assert type(trace) is EnhancedStackTrace
 
         assert "never_completing_coroutine" in [
             loc.function_name for stack in trace.stacks for loc in stack.locations
@@ -2225,7 +2223,7 @@ async def status() -> str:
 
         # test that a coroutine only has the source as its stack
 
-        assert type(trace) == EnhancedStackTrace
+        assert type(trace) is EnhancedStackTrace
 
         assert "never_completing_coroutine" in [
             loc.function_name for stack in trace.stacks for loc in stack.locations
diff --git a/tests/worker/workflow_sandbox/test_runner.py b/tests/worker/workflow_sandbox/test_runner.py
@@ -7,6 +7,9 @@
 import os
 import time
 import uuid
+
+# This used to fail because our __init__ couldn't handle metaclass init
+import zipfile
 from dataclasses import dataclass
 from datetime import date, datetime, timedelta
 from enum import IntEnum
@@ -33,9 +36,6 @@
 # runtime only
 _ = os.name
 
-# This used to fail because our __init__ couldn't handle metaclass init
-import zipfile
-
 
 class MyZipFile(zipfile.ZipFile):
     pass

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`import google.protobuf.internal.containers`
`33`		`-from typing_extensions import ClassVar, NamedTuple, Self, TypeAlias, get_origin`
	`33`	`+from typing_extensions import NamedTuple, Self, TypeAlias, get_origin`
`34`	`34`
`35`	`35`	`import temporalio.api.common.v1`
`36`	`36`	`import temporalio.api.enums.v1`