diff --git a/pyproject.toml b/pyproject.toml index 922e40a..116e9d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ authors = [ license = { text = "GPL-3.0 License" } requires-python = "<4.0.0,>=3.8.1" dependencies = [ - "textual==2.1.2", + "textual==3.0.1", ] name = "recoverpy" version = "2.2.0" diff --git a/tests/integration/test_full_workflow.py b/tests/integration/test_full_workflow.py index 41680a2..2878f60 100644 --- a/tests/integration/test_full_workflow.py +++ b/tests/integration/test_full_workflow.py @@ -54,11 +54,11 @@ async def test_full_workflow(session_mocker, tmp_path: Path): assert pilot.app.screen._start_search_button.disabled is True # Test partition list default state - filter_checkbox = pilot.app.query("Checkbox").only_one() + filter_checkbox = pilot.app.screen.query("Checkbox").only_one() assert filter_checkbox is not None assert filter_checkbox.value is True - items = list(pilot.app.query("ListItem").results()) + items = list(pilot.app.screen.query("ListItem").results()) assert len(items) == VISIBLE_PARTITION_COUNT # Test partition list unfiltered @@ -67,10 +67,10 @@ async def test_full_workflow(session_mocker, tmp_path: Path): assert filter_checkbox.value is False await assert_with_timeout( - lambda: len(list(pilot.app.query("ListItem").results())) + lambda: len(list(pilot.app.screen.query("ListItem").results())) == UNFILTERED_PARTITION_COUNT, UNFILTERED_PARTITION_COUNT, - len(list(pilot.app.query("ListItem").results())), + len(list(pilot.app.screen.query("ListItem").results())), ) # Test partition list filtered @@ -79,10 +79,10 @@ async def test_full_workflow(session_mocker, tmp_path: Path): assert filter_checkbox.value is True await assert_with_timeout( - lambda: len(list(pilot.app.query("ListItem").results())) + lambda: len(list(pilot.app.screen.query("ListItem").results())) == VISIBLE_PARTITION_COUNT, VISIBLE_PARTITION_COUNT, - len(list(pilot.app.query("ListItem").results())), + len(list(pilot.app.screen.query("ListItem").results())), ) # Test input search parameters @@ -133,14 +133,14 @@ async def test_full_workflow(session_mocker, tmp_path: Path): len(pilot.app.screen._grep_result_list.grep_results), ) await assert_with_timeout( - lambda: len(list(pilot.app.query("ListItem").results())) + lambda: len(list(pilot.app.screen.query("ListItem").results())) == GREP_RESULT_COUNT, GREP_RESULT_COUNT, - len(list(pilot.app.query("ListItem").results())), + len(list(pilot.app.screen.query("ListItem").results())), ) # Test select search results - list_items = list(pilot.app.query("ListItem").results()) + list_items = list(pilot.app.screen.query("ListItem").results()) for item in list_items: await pilot.click(f"#{item.id}") @@ -223,7 +223,7 @@ async def test_full_workflow(session_mocker, tmp_path: Path): add_expected_save_result(pilot) # Test select previous result - previous_button = pilot.app.query("#previous-button").only_one() + previous_button = pilot.app.screen.query("#previous-button").only_one() current_inode = pilot.app.screen._inode await pilot.click("#previous-button") await pilot.pause() diff --git a/uv.lock b/uv.lock index 8b69f6c..40be646 100644 --- a/uv.lock +++ b/uv.lock @@ -1,4 +1,5 @@ version = 1 +revision = 1 requires-python = ">=3.8.1, <4.0.0" resolution-markers = [ "python_full_version >= '3.9'", @@ -409,7 +410,7 @@ wheels = [ [[package]] name = "recoverpy" -version = "2.1.9" +version = "2.2.0" source = { editable = "." } dependencies = [ { name = "textual" }, @@ -429,7 +430,7 @@ dev = [ ] [package.metadata] -requires-dist = [{ name = "textual", specifier = "==1.0.0" }] +requires-dist = [{ name = "textual", specifier = "==3.0.1" }] [package.metadata.requires-dev] dev = [ @@ -483,7 +484,7 @@ wheels = [ [[package]] name = "textual" -version = "1.0.0" +version = "3.0.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "markdown-it-py", extra = ["linkify", "plugins"] }, @@ -491,9 +492,9 @@ dependencies = [ { name = "rich" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/1f/b6/59b1de04bb4dca0f21ed7ba0b19309ed7f3f5de4396edf20cc2855e53085/textual-1.0.0.tar.gz", hash = "sha256:bec9fe63547c1c552569d1b75d309038b7d456c03f86dfa3706ddb099b151399", size = 1532733 } +sdist = { url = "https://files.pythonhosted.org/packages/8a/87/eda3ef12ac40b46a6d2930b89f19ffb1b8cde1ead8b24b0a31521eb8d2e6/textual-3.0.1.tar.gz", hash = "sha256:a5bfc924d63ceb16a4c63ce4ff4b424e5c554c4dfd71336450885c85dfc6247e", size = 1593717 } wheels = [ - { url = "https://files.pythonhosted.org/packages/ac/bb/5fb6656c625019cd653d5215237d7cd6e0b12e7eae4195c3d1c91b2136fc/textual-1.0.0-py3-none-any.whl", hash = "sha256:2d4a701781c05104925e463ae370c630567c70c2880e92ab838052e3e23c986f", size = 660456 }, + { url = "https://files.pythonhosted.org/packages/49/57/6242ff473b0991055bbc7ab7e313dc6f1aa184c03326a252f1236162a875/textual-3.0.1-py3-none-any.whl", hash = "sha256:99daade46a3209c2f25a7ea210485192ebf8a3340108731c1a4600676f188619", size = 681772 }, ] [[package]]