Update Rust dependencies (#281)

cretz · web-flow · commit 2ce6d9fd6f34 · 2023-02-16T16:42:47.000-06:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -57,8 +57,8 @@ pydoctor = { git = "https://github.com/cretz/pydoctor.git", branch = "overloads"
 pytest = "^7.1.2"
 pytest-asyncio = "^0.18.3"
 pytest-timeout = "^2.1.0"
-setuptools = "^65.0.0"
-setuptools-rust = "^1.3.0"
+setuptools = ">=65.0.0"
+setuptools-rust = ">=1.3.0"
 toml = "^0.10.2"
 twine = "^4.0.1"
 
diff --git a/temporalio/bridge/Cargo.lock b/temporalio/bridge/Cargo.lock
diff --git a/temporalio/bridge/Cargo.toml b/temporalio/bridge/Cargo.toml
@@ -13,8 +13,8 @@ once_cell = "1.16.0"
 parking_lot = "0.12"
 prost = "0.11"
 prost-types = "0.11"
-pyo3 = { version = "0.16", features = ["extension-module", "abi3-py37"] }
-pyo3-asyncio = { version = "0.16", features = ["tokio-runtime"] }
+pyo3 = { version = "0.18", features = ["extension-module", "abi3-py37"] }
+pyo3-asyncio = { version = "0.18", features = ["tokio-runtime"] }
 temporal-client = { version = "0.1.0", path = "./sdk-core/client" }
 temporal-sdk-core = { version = "0.1.0", path = "./sdk-core/core" }
 temporal-sdk-core-api = { version = "0.1.0", path = "./sdk-core/core-api" }
diff --git a/temporalio/worker/workflow_sandbox/_restrictions.py b/temporalio/worker/workflow_sandbox/_restrictions.py
@@ -345,6 +345,10 @@ def with_child_unrestricted(self, *child_path: str) -> SandboxMatcher:
     "google.protobuf",
     "temporalio.api",
     "temporalio.bridge.proto",
+    # Must pass through the entire bridge in even the most minimum causes
+    # because PyO3 does not allow re-init since 0.17. See
+    # https://github.com/PyO3/pyo3/pull/2523.
+    "temporalio.bridge.temporal_sdk_bridge",
 }
 
 SandboxRestrictions.passthrough_modules_with_temporal = SandboxRestrictions.passthrough_modules_minimum | {
diff --git a/tests/worker/test_activity.py b/tests/worker/test_activity.py
@@ -250,7 +250,7 @@ async def wait_cancel() -> str:
         wait_cancel,
         cancel_after_ms=100,
         wait_for_cancellation=True,
-        heartbeat_timeout_ms=1000,
+        heartbeat_timeout_ms=2000,
     )
     assert result.result == "Got cancelled error, cancelled? True"
 

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ async def wait_cancel() -> str:`
`250`	`250`	`wait_cancel,`
`251`	`251`	`cancel_after_ms=100,`
`252`	`252`	`wait_for_cancellation=True,`
`253`		`- heartbeat_timeout_ms=1000,`
	`253`	`+ heartbeat_timeout_ms=2000,`
`254`	`254`	`)`
`255`	`255`	`assert result.result == "Got cancelled error, cancelled? True"`
`256`	`256`