From 8f6241be9128415e41d7e854907fc5f98790857b Mon Sep 17 00:00:00 2001 From: Christophe Bornet Date: Wed, 18 Dec 2024 15:43:31 +0100 Subject: [PATCH] feat: Bump blockbuster version to 1.5.2 (#5331) Bump blockbuster version to 1.5.2 --- pyproject.toml | 2 +- src/backend/tests/conftest.py | 30 +++++++++++------------------- uv.lock | 8 ++++---- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index df3631040..8568b2e53 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -180,7 +180,7 @@ dev-dependencies = [ "asgi-lifespan>=2.1.0", "pytest-github-actions-annotate-failures>=0.2.0", "pytest-codspeed>=3.0.0", - "blockbuster>=1.5.0,<1.6", + "blockbuster>=1.5.2,<1.6", "types-aiofiles>=24.1.0.20240626", ] diff --git a/src/backend/tests/conftest.py b/src/backend/tests/conftest.py index 0838f2344..6e0ce6b9a 100644 --- a/src/backend/tests/conftest.py +++ b/src/backend/tests/conftest.py @@ -56,35 +56,27 @@ def blockbuster(request): "os.stat", "os.path.abspath", ]: - bb.functions[func].can_block_functions.append(("settings/service.py", {"initialize"})) + bb.functions[func].can_block_in("settings/service.py", "initialize") for func in [ "io.BufferedReader.read", "io.TextIOWrapper.read", ]: - bb.functions[func].can_block_functions.append(("importlib_metadata/__init__.py", {"metadata"})) + bb.functions[func].can_block_in("importlib_metadata/__init__.py", "metadata") # TODO: make set_class_code async - bb.functions["os.stat"].can_block_functions.append( - ("langflow/custom/custom_component/component.py", {"set_class_code"}) - ) + bb.functions["os.stat"].can_block_in("langflow/custom/custom_component/component.py", "set_class_code") # TODO: follow discussion in https://github.com/encode/httpx/discussions/3456 - bb.functions["os.stat"].can_block_functions.append(("httpx/_client.py", {"_init_transport"})) + bb.functions["os.stat"].can_block_in("httpx/_client.py", "_init_transport") - bb.functions["os.stat"].can_block_functions.append(("linecache.py", {"checkcache", "updatecache"})) - bb.functions["os.stat"].can_block_functions.append(("rich/traceback.py", {"_render_stack"})) - bb.functions["os.stat"].can_block_functions.append( - ("langchain_core/_api/internal.py", {"is_caller_internal"}) + bb.functions["os.stat"].can_block_in("rich/traceback.py", "_render_stack") + bb.functions["os.stat"].can_block_in("langchain_core/_api/internal.py", "is_caller_internal") + + ( + bb.functions["os.path.abspath"] + .can_block_in("loguru/_better_exceptions.py", {"_get_lib_dirs", "_format_exception"}) + .can_block_in("sqlalchemy/dialects/sqlite/pysqlite.py", "create_connect_args") ) - bb.functions["os.path.abspath"].can_block_functions.extend( - [ - ("loguru/_better_exceptions.py", {"_get_lib_dirs", "_format_exception"}), - ("sqlalchemy/dialects/sqlite/pysqlite.py", {"create_connect_args"}), - ("_pytest/assertion/rewrite.py", {"_should_rewrite"}), - ] - ) - bb.functions["os.mkdir"].can_block_functions.append(("_pytest/assertion/rewrite.py", {"try_makedirs"})) - bb.functions["os.replace"].can_block_functions.append(("_pytest/assertion/rewrite.py", {"_write_pyc"})) yield bb diff --git a/uv.lock b/uv.lock index 1f933b928..41374b5f5 100644 --- a/uv.lock +++ b/uv.lock @@ -520,14 +520,14 @@ wheels = [ [[package]] name = "blockbuster" -version = "1.5.0" +version = "1.5.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "forbiddenfruit" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f1/5d/1999e1a4a204b7a0b72662b8b1390a162b32a601f9a7fbe7549f1e77b3fe/blockbuster-1.5.0.tar.gz", hash = "sha256:f647638413f99fc6a6e47923ce3fa7ff3b9c078b458ed00e6131941db5540fac", size = 10431 } +sdist = { url = "https://files.pythonhosted.org/packages/a7/3a/07f9c267527c561cb0bdca99147d84f7e0c0551b00869bc63a4906280f2b/blockbuster-1.5.2.tar.gz", hash = "sha256:3588dd4d6f18ec1a64e0c9b9fe13eec79e5b16cf4e49504956d8168a33738583", size = 10751 } wheels = [ - { url = "https://files.pythonhosted.org/packages/7e/06/c9103025eb2e58a2853fbea4be184db4342c37510b09131af9d7b1218e3f/blockbuster-1.5.0-py3-none-any.whl", hash = "sha256:24c2923980a17fe4231b16942d45a117278b8939eeeba64dec3e7b92a91867c6", size = 8475 }, + { url = "https://files.pythonhosted.org/packages/bb/8f/7faccc4f7353606606fab3851bf4652f915348f368e71f8d6910474b7f7c/blockbuster-1.5.2-py3-none-any.whl", hash = "sha256:7853b05bf6650c74b2f07324bd56c277f4ef3d7dcc2d4e6b7cf21a758de706bf", size = 8743 }, ] [[package]] @@ -4015,7 +4015,7 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ { name = "asgi-lifespan", specifier = ">=2.1.0" }, - { name = "blockbuster", specifier = ">=1.5.0,<1.6" }, + { name = "blockbuster", specifier = ">=1.5.2,<1.6" }, { name = "dictdiffer", specifier = ">=0.9.0" }, { name = "httpx", specifier = ">=0.27.0" }, { name = "ipykernel", specifier = ">=6.29.0" },