From cf089abb64095b794cb284bcec6e3188a113be7f Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 6 Mar 2025 12:32:06 -0800 Subject: [PATCH] switch to tslp --- aider/args.py | 6 ------ aider/main.py | 17 ----------------- requirements.txt | 24 +++++++++++++++++------- requirements/common-constraints.txt | 21 ++++++++++++--------- requirements/requirements-dev.txt | 2 +- requirements/requirements.in | 3 --- 6 files changed, 30 insertions(+), 43 deletions(-) diff --git a/aider/args.py b/aider/args.py index ca287e712..591183f7c 100644 --- a/aider/args.py +++ b/aider/args.py @@ -841,12 +841,6 @@ def get_parser(default_config_files, git_root): "--editor", help="Specify which editor to use for the /editor command", ) - group.add_argument( - "--install-tree-sitter-language-pack", - action="store_true", - help="Install the tree_sitter_language_pack (experimental)", - default=False, - ) return parser diff --git a/aider/main.py b/aider/main.py index d7661df9a..e11db45f3 100644 --- a/aider/main.py +++ b/aider/main.py @@ -204,18 +204,6 @@ def check_streamlit_install(io): ) -def install_tree_sitter_language_pack(io): - return utils.check_pip_install_extra( - io, - "tree_sitter_language_pack", - "Install tree_sitter_language_pack?", - [ - "tree-sitter-language-pack==0.4.0", - "tree-sitter==0.24.0", - ], - ) - - def write_streamlit_credentials(): from streamlit.file_util import get_streamlit_file_path @@ -712,11 +700,6 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F analytics.event("exit", reason="Upgrade completed") return 0 if success else 1 - if args.install_tree_sitter_language_pack: - success = install_tree_sitter_language_pack(io) - analytics.event("exit", reason="Install TSLP completed") - return 0 if success else 1 - if args.check_update: check_version(io, verbose=args.verbose) diff --git a/requirements.txt b/requirements.txt index 3d0aecf79..6bb1a8993 100644 --- a/requirements.txt +++ b/requirements.txt @@ -98,7 +98,7 @@ gitpython==3.1.44 # via # -c requirements/common-constraints.txt # -r requirements/requirements.in -grep-ast==0.6.1 +grep-ast==0.7.0 # via # -c requirements/common-constraints.txt # -r requirements/requirements.in @@ -156,7 +156,7 @@ jsonschema-specifications==2024.10.1 # via # -c requirements/common-constraints.txt # jsonschema -litellm==1.63.0 +litellm==1.63.2 # via # -c requirements/common-constraints.txt # -r requirements/requirements.in @@ -368,16 +368,26 @@ tqdm==4.67.1 # -c requirements/common-constraints.txt # huggingface-hub # openai -tree-sitter==0.21.3 +tree-sitter==0.24.0 # via # -c requirements/common-constraints.txt - # -r requirements/requirements.in - # grep-ast - # tree-sitter-languages -tree-sitter-languages==1.10.2 + # tree-sitter-language-pack +tree-sitter-c-sharp==0.23.1 + # via + # -c requirements/common-constraints.txt + # tree-sitter-language-pack +tree-sitter-embedded-template==0.23.2 + # via + # -c requirements/common-constraints.txt + # tree-sitter-language-pack +tree-sitter-language-pack==0.6.0 # via # -c requirements/common-constraints.txt # grep-ast +tree-sitter-yaml==0.7.0 + # via + # -c requirements/common-constraints.txt + # tree-sitter-language-pack typing-extensions==4.12.2 # via # -c requirements/common-constraints.txt diff --git a/requirements/common-constraints.txt b/requirements/common-constraints.txt index acbe625df..6841a5721 100644 --- a/requirements/common-constraints.txt +++ b/requirements/common-constraints.txt @@ -116,7 +116,7 @@ greenlet==3.1.1 # via # playwright # sqlalchemy -grep-ast==0.6.1 +grep-ast==0.7.0 # via -r requirements/requirements.in h11==0.14.0 # via httpcore @@ -174,7 +174,7 @@ jsonschema-specifications==2024.10.1 # via jsonschema kiwisolver==1.4.8 # via matplotlib -litellm==1.63.0 +litellm==1.63.2 # via -r requirements/requirements.in llama-index-core==0.12.22 # via @@ -455,13 +455,16 @@ tqdm==4.67.1 # transformers transformers==4.49.0 # via sentence-transformers -tree-sitter==0.21.3 - # via - # -r requirements/requirements.in - # grep-ast - # tree-sitter-languages -tree-sitter-languages==1.10.2 +tree-sitter==0.24.0 + # via tree-sitter-language-pack +tree-sitter-c-sharp==0.23.1 + # via tree-sitter-language-pack +tree-sitter-embedded-template==0.23.2 + # via tree-sitter-language-pack +tree-sitter-language-pack==0.6.0 # via grep-ast +tree-sitter-yaml==0.7.0 + # via tree-sitter-language-pack typer==0.15.2 # via -r requirements/requirements-dev.in typing-extensions==4.12.2 @@ -493,7 +496,7 @@ urllib3==2.3.0 # requests uv==0.6.4 # via -r requirements/requirements-dev.in -virtualenv==20.29.2 +virtualenv==20.29.3 # via pre-commit watchfiles==1.0.4 # via -r requirements/requirements.in diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index d64f69a09..0a935b1af 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -209,7 +209,7 @@ uv==0.6.4 # via # -c requirements/common-constraints.txt # -r requirements/requirements-dev.in -virtualenv==20.29.2 +virtualenv==20.29.3 # via # -c requirements/common-constraints.txt # pre-commit diff --git a/requirements/requirements.in b/requirements/requirements.in index c2e39e036..101f16988 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -42,9 +42,6 @@ networkx<3.3 # Pin below 1.14 to retain python 3.9 compatibility. scipy<1.14 -# v0.22.2 seems to break tree-sitter-languages? -tree-sitter==0.21.3 - # GitHub Release action failing on "KeyError: 'home-page'" # https://github.com/pypa/twine/blob/6fbf880ee60915cf1666348c4bdd78a10415f2ac/twine/__init__.py#L40 # Uses importlib-metadata