From 0b8d7677d3fd396f515dd5f46cdb47c3da3885bd Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Sat, 3 Oct 2026 12:24:31 -0400 Subject: [PATCH] move fzf package under integrations/ --- AGENTS.md | 3 +-- mycli/packages/{ => integrations}/fzf/__init__.py | 0 mycli/packages/{ => integrations}/fzf/fzf.py | 0 mycli/packages/prompt_toolkit/fzf_history.py | 2 +- mycli_test/pytests/test_fzf.py | 4 ++-- mycli_test/pytests/test_ptoolkit_fzf_history.py | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) rename mycli/packages/{ => integrations}/fzf/__init__.py (100%) rename mycli/packages/{ => integrations}/fzf/fzf.py (100%) diff --git a/AGENTS.md b/AGENTS.md index b4fa25e6c..7f7ce61c3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -45,9 +45,8 @@ A command line client for MySQL with auto-completion and syntax highlighting. ├── mycli/packages/datafrane/transform.py # implements `.|` transforms ├── mycli/packages/execution/background_runner.py # run queries in the background, with query state and timing updates ├── mycli/packages/execution/sql_execute.py # `SQLExecute` class and friends - ├── mycli/packages/fzf/fzf.py # general interface to fzf chooser ├── mycli/packages/hybrid_redirection/ # implementation of shell-style redirects - ├── mycli/packages/integrations/ # integrations with Boundary, Kubernetes, macOS, OpenSSH, and Vault + ├── mycli/packages/integrations/ # integrations with fzf, Boundary, Kubernetes, macOS, OpenSSH, and Vault ├── mycli/packages/prompt_toolkit/fzf_history.py # uses fzf integration to serach the prompt_toolkit history ├── mycli/packages/prompt_toolkit/history.py # extends the prompt_toolkit history class ├── mycli/packages/prompt_toolkit/key_bindings.py # prompt_toolkit key bindings diff --git a/mycli/packages/fzf/__init__.py b/mycli/packages/integrations/fzf/__init__.py similarity index 100% rename from mycli/packages/fzf/__init__.py rename to mycli/packages/integrations/fzf/__init__.py diff --git a/mycli/packages/fzf/fzf.py b/mycli/packages/integrations/fzf/fzf.py similarity index 100% rename from mycli/packages/fzf/fzf.py rename to mycli/packages/integrations/fzf/fzf.py diff --git a/mycli/packages/prompt_toolkit/fzf_history.py b/mycli/packages/prompt_toolkit/fzf_history.py index 8330e97f3..94a8e9455 100644 --- a/mycli/packages/prompt_toolkit/fzf_history.py +++ b/mycli/packages/prompt_toolkit/fzf_history.py @@ -5,7 +5,7 @@ from prompt_toolkit import search from prompt_toolkit.key_binding.key_processor import KeyPressEvent -from mycli.packages.fzf.fzf import Fzf +from mycli.packages.integrations.fzf.fzf import Fzf from mycli.packages.prompt_toolkit.history import FileHistoryWithTimestamp from mycli.packages.prompt_toolkit.utils import safe_invalidate_display diff --git a/mycli_test/pytests/test_fzf.py b/mycli_test/pytests/test_fzf.py index 6ffd09f65..394691947 100644 --- a/mycli_test/pytests/test_fzf.py +++ b/mycli_test/pytests/test_fzf.py @@ -2,8 +2,8 @@ import pytest -from mycli.packages.fzf import fzf as fzf_module -from mycli.packages.fzf.fzf import Fzf +from mycli.packages.integrations.fzf import fzf as fzf_module +from mycli.packages.integrations.fzf.fzf import Fzf @pytest.fixture diff --git a/mycli_test/pytests/test_ptoolkit_fzf_history.py b/mycli_test/pytests/test_ptoolkit_fzf_history.py index af96973f1..241f50928 100644 --- a/mycli_test/pytests/test_ptoolkit_fzf_history.py +++ b/mycli_test/pytests/test_ptoolkit_fzf_history.py @@ -3,7 +3,7 @@ import pytest -from mycli.packages.fzf import fzf as fzf_wrapper +from mycli.packages.integrations.fzf import fzf as fzf_wrapper from mycli.packages.prompt_toolkit import fzf_history as fzf_module from mycli.packages.prompt_toolkit.history import FileHistoryWithTimestamp