From b1f5b0a5d3a89f2cc6d7107444b61fe5a5846c1d Mon Sep 17 00:00:00 2001 From: edward Date: Tue, 6 Jun 2023 18:08:38 -0400 Subject: [PATCH 1/3] bump black version --- ofrak_core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofrak_core/requirements.txt b/ofrak_core/requirements.txt index 9f74a9376..95a077330 100644 --- a/ofrak_core/requirements.txt +++ b/ofrak_core/requirements.txt @@ -1,7 +1,7 @@ aiohttp~=3.8.1 aiohttp-cors~=0.7.0 beartype~=0.12.0 -black==22.6.0 +black==23.3.0 fdt==0.3.3 importlib-metadata>=4.13 intervaltree==3.1.0 From eccd7e8725059b3647015de8adcb111a5a4375c5 Mon Sep 17 00:00:00 2001 From: edward Date: Tue, 6 Jun 2023 18:41:55 -0400 Subject: [PATCH 2/3] remove now unexpected blank lines --- ofrak_core/test_ofrak/unit/test_ofrak_server.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/ofrak_core/test_ofrak/unit/test_ofrak_server.py b/ofrak_core/test_ofrak/unit/test_ofrak_server.py index 9237d77bc..e85d1ce28 100644 --- a/ofrak_core/test_ofrak/unit/test_ofrak_server.py +++ b/ofrak_core/test_ofrak/unit/test_ofrak_server.py @@ -466,7 +466,6 @@ async def test_update_script(ofrak_client: TestClient, hello_world_elf): "", "", "async def main(ofrak_context: OFRAKContext, root_resource: Optional[Resource] = None):", - "", " if root_resource is None:", " root_resource = await ofrak_context.create_root_resource_from_file(", ' "hello_world_elf"', @@ -587,7 +586,6 @@ def get_child_sort_key(child): "", "", "async def main(ofrak_context: OFRAKContext, root_resource: Optional[Resource] = None):", - "", " if root_resource is None:", " root_resource = await ofrak_context.create_root_resource_from_file(", ' "hello_world_elf"', @@ -683,7 +681,6 @@ async def test_clear_action_queue(ofrak_client: TestClient, hello_world_elf): "", "", "async def main(ofrak_context: OFRAKContext):", - "", " root_resource = await ofrak_context.create_root_resource_from_file(", ' "hello_world_elf"', " )", From a03fa35ed41cb30ce67a2001fba7898d11e60db1 Mon Sep 17 00:00:00 2001 From: edward Date: Tue, 6 Jun 2023 19:09:15 -0400 Subject: [PATCH 3/3] remove another extra line --- ofrak_core/test_ofrak/unit/test_ofrak_server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ofrak_core/test_ofrak/unit/test_ofrak_server.py b/ofrak_core/test_ofrak/unit/test_ofrak_server.py index e85d1ce28..86df7102b 100644 --- a/ofrak_core/test_ofrak/unit/test_ofrak_server.py +++ b/ofrak_core/test_ofrak/unit/test_ofrak_server.py @@ -932,7 +932,6 @@ async def test_add_flush_to_disk_to_script(ofrak_client: TestClient, firmware_zi "", "", "async def main(ofrak_context: OFRAKContext, root_resource: Optional[Resource] = None):", - "", " if root_resource is None:", " root_resource = await ofrak_context.create_root_resource_from_file(", ' "firmware_zip"',