Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade tree sitter #6740

Merged
merged 5 commits into from
Feb 17, 2025
Merged

Upgrade tree sitter #6740

merged 5 commits into from
Feb 17, 2025

Conversation

neubig
Copy link
Contributor

@neubig neubig commented Feb 15, 2025

End-user friendly description of the problem this fixes or functionality that this introduces

  • Include this change in the Release Notes. If checked, you must provide an end-user friendly description for your change below

Give a summary of what the PR does, explaining any non-trivial design decisions

This PR #5534 may require upgrading tree-sitter, so this PR attempts to upgrade tree sitter. Let's see if tests pass.

CC @kjain14 @enyst


To run this PR locally, use the following command:

docker run -it --rm   -p 3000:3000   -v /var/run/docker.sock:/var/run/docker.sock   --add-host host.docker.internal:host-gateway   -e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:35d12b8-nikolaik   --name openhands-app-35d12b8   docker.all-hands.dev/all-hands-ai/openhands:35d12b8

@enyst
Copy link
Collaborator

enyst commented Feb 15, 2025

Ah, the pin comes from aci

openhands-ai-py3.12➜ odie git:(upgrade-tree-sitter) ✗ poetry lock
Resolving dependencies... (0.6s)

Because openhands-aci (0.2.2) depends on tree-sitter (0.21.3)
and no versions of openhands-aci match >0.2.2,<0.3.0, openhands-aci (>=0.2.2,<0.3.0) requires tree-sitter (0.21.3).
So, because openhands-ai depends on both tree-sitter (^0.24.0) and openhands-aci (^0.2.2), version solving failed.

@neubig neubig requested a review from ryanhoangt February 17, 2025 14:50
Copy link
Contributor

@ryanhoangt ryanhoangt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! One small nit: I noticed the new lock file was generated using v1.8.4, while the old one used v2.0.x. Should we also regenerate it with v2.0.x for consistency?

@enyst
Copy link
Collaborator

enyst commented Feb 17, 2025

LGTM! One small nit: I noticed the new lock file was generated using v1.8.4, while the old one used v2.0.x. Should we also regenerate it with v2.0.x for consistency?

Ah, I've seen this one. Regenerating, thanks!

@enyst enyst merged commit 07fcb78 into main Feb 17, 2025
14 checks passed
@enyst enyst deleted the upgrade-tree-sitter branch February 17, 2025 19:14
@enyst
Copy link
Collaborator

enyst commented Feb 17, 2025

Let's see it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants