From e4f496d65e9592f7e897cff5ad199c8c61d2d106 Mon Sep 17 00:00:00 2001 From: Mateusz Kudela Date: Fri, 29 Aug 2025 08:43:43 +0000 Subject: [PATCH 1/2] Bump hive with newest wax and beekeepy --- .gitlab-ci.yml | 2 +- hive | 2 +- poetry.lock | 28 ++++++++++++++-------------- pyproject.toml | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea972f5f3a..4425a04ee8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ variables: include: - project: 'hive/hive' - ref: 42ea9b45db6092068af284f2ff6da9c9cb8fc5b3 + ref: 05188a3b44d0b1fa62f0519b2072b98c417a72de file: '/scripts/ci-helpers/prepare_data_image_job.yml' # Do not include common-ci-configuration here, it is already referenced by scripts/ci-helpers/prepare_data_image_job.yml included from Hive diff --git a/hive b/hive index 42ea9b45db..05188a3b44 160000 --- a/hive +++ b/hive @@ -1 +1 @@ -Subproject commit 42ea9b45db6092068af284f2ff6da9c9cb8fc5b3 +Subproject commit 05188a3b44d0b1fa62f0519b2072b98c417a72de diff --git a/poetry.lock b/poetry.lock index f4f7bd4300..d6a4a11148 100644 --- a/poetry.lock +++ b/poetry.lock @@ -221,13 +221,13 @@ extras = ["regex"] [[package]] name = "beekeepy" -version = "0.0.1.dev414+2be9929" +version = "0.0.1.dev419+dff51e3" description = "All in one package for beekeeper interaction via Python interface." optional = false python-versions = ">=3.12,<4.0" groups = ["main", "dev", "embeddedtestnet"] files = [ - {file = "beekeepy-0.0.1.dev414+2be9929-py3-none-any.whl", hash = "sha256:1d823e1ed7caeb27b080cdcb3885b1665e3d74034f2db20b737461d6bcabe4d6"}, + {file = "beekeepy-0.0.1.dev419+dff51e3-py3-none-any.whl", hash = "sha256:f91d97b0b24c0759739682b3244adbae5d767fd4d73b5ab727e9688eb2039222"}, ] [package.dependencies] @@ -414,17 +414,17 @@ markers = {main = "sys_platform == \"win32\" or platform_system == \"Windows\"", [[package]] name = "database-api" -version = "1.27.12rc2.dev3+01f511404" +version = "1.27.12rc2.dev15+3e3df050d" description = "" optional = false python-versions = ">=3.12,<4.0" groups = ["main", "dev", "embeddedtestnet"] files = [ - {file = "database_api-1.27.12rc2.dev3+01f511404-py3-none-any.whl", hash = "sha256:0130d07f40e390cf9a9e1215bf6f639f43a3447d0e47fc94e4c97705a0fd130c"}, + {file = "database_api-1.27.12rc2.dev15+3e3df050d-py3-none-any.whl", hash = "sha256:d81b0f89c7bfd86ffcb64f1337a6d8cfe5e4734f90ea24ebadec24b1e3cf1b4a"}, ] [package.dependencies] -beekeepy = "0.0.1.dev414+2be9929" +beekeepy = "0.0.1.dev419+dff51e3" [package.source] type = "legacy" @@ -1504,17 +1504,17 @@ files = [ [[package]] name = "network-broadcast-api" -version = "1.27.12rc2.dev3+01f511404" +version = "1.27.12rc2.dev15+3e3df050d" description = "" optional = false python-versions = ">=3.12,<4.0" groups = ["main", "dev", "embeddedtestnet"] files = [ - {file = "network_broadcast_api-1.27.12rc2.dev3+01f511404-py3-none-any.whl", hash = "sha256:5c7f12777f53b788da51c5343108491efcf497f6f430fe3d86ecb5dd7102d136"}, + {file = "network_broadcast_api-1.27.12rc2.dev15+3e3df050d-py3-none-any.whl", hash = "sha256:f1d38329473a021a88bd85caa517e5643e9d0ad5a235490858c260360138ceb9"}, ] [package.dependencies] -beekeepy = "0.0.1.dev414+2be9929" +beekeepy = "0.0.1.dev419+dff51e3" [package.source] type = "legacy" @@ -2176,7 +2176,7 @@ develop = false abstractcp = "0.9.9" loguru = "0.7.2" python-dateutil = "2.8.2" -wax = "0.3.10.dev849+95186050" +wax = "0.3.10.dev860+c5e9bffa" [package.source] type = "directory" @@ -2375,20 +2375,20 @@ watchmedo = ["PyYAML (>=3.10)"] [[package]] name = "wax" -version = "0.3.10.dev849+95186050" +version = "0.3.10.dev860+c5e9bffa" description = "" optional = false python-versions = ">=3.12,<4.0" groups = ["main", "dev", "embeddedtestnet"] files = [ - {file = "wax-0.3.10.dev849+95186050-cp312-cp312-manylinux_2_39_x86_64.whl", hash = "sha256:1bc7b15c058bd8a7c20e5104f2cb8174ffaafc36917f1e08997a7936d2ff348b"}, + {file = "wax-0.3.10.dev860+c5e9bffa-cp312-cp312-manylinux_2_39_x86_64.whl", hash = "sha256:78833a1e095b5d8aa8f25aa04e738e1017e3f4b8de04fec2b131d00e2f355691"}, ] [package.dependencies] -database-api = "1.27.12rc2.dev3+01f511404" +database-api = "1.27.12rc2.dev15+3e3df050d" httpx = {version = "0.23.3", extras = ["http2"]} loguru = "0.7.2" -network-broadcast-api = "1.27.12rc2.dev3+01f511404" +network-broadcast-api = "1.27.12rc2.dev15+3e3df050d" protobuf = "4.24.4" python-dateutil = "2.8.2" requests = "2.32.3" @@ -2519,4 +2519,4 @@ propcache = ">=0.2.1" [metadata] lock-version = "2.1" python-versions = ">=3.12,<3.13" -content-hash = "e9525511ebe6bf675de3a581693372e91e9d584eb9e9ac169d035d94f9e1c3f7" +content-hash = "6b1f5e074c17e4e00547e107caa05801852c09a05b415aa9a025254038e11937" diff --git a/pyproject.toml b/pyproject.toml index 2f09d4ff9c..75ad58e4cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,8 +23,8 @@ dependencies = [ 'toml (==0.10.2)', "pathvalidate (==3.3.1)", 'schemas (==0.0.1.dev426+0dea163)', - 'beekeepy (==0.0.1.dev414+2be9929)', - 'wax (==0.3.10.dev849+95186050)', + 'beekeepy (==0.0.1.dev419+dff51e3)', + 'wax (==0.3.10.dev860+c5e9bffa)', ] [project.urls] -- GitLab From fb3f3e46486dc7238fda0882bd3f40563448cf97 Mon Sep 17 00:00:00 2001 From: Mateusz Kudela Date: Tue, 26 Aug 2025 12:09:27 +0000 Subject: [PATCH 2/2] Add is_wax_interface_available property and teardown during close in world --- clive/__private/core/world.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clive/__private/core/world.py b/clive/__private/core/world.py index c79ccbfc31..2c9876405c 100644 --- a/clive/__private/core/world.py +++ b/clive/__private/core/world.py @@ -116,6 +116,10 @@ class World: ) return self._wax_interface + @property + def is_wax_interface_available(self) -> bool: + return self._wax_interface is not None + @property def _should_save_profile_on_close(self) -> bool: return self.is_profile_available @@ -132,6 +136,8 @@ class World: if self.is_node_available: self.node.teardown() self._beekeeper_manager.teardown() + if self.is_wax_interface_available: + self.wax_interface.teardown() await self.app_state.lock() -- GitLab