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.

Sign up for GitHub

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

more lenient tree-sitter dep range #24

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

more lenient tree-sitter dep range #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
[package]
name = "tree-sitter-jsonnet"
description = "jsonnet grammar for the tree-sitter parsing library"
version = "0.0.1"
version = "0.0.2"
keywords = ["incremental", "parsing", "jsonnet"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/tree-sitter/tree-sitter-jsonnet"
edition = "2018"
license = "MIT"

build = "bindings/rust/build.rs"
include = [
"bindings/rust/*",
"grammar.js",
"queries/*",
"src/*",
]
include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]

[lib]
path = "bindings/rust/lib.rs"

[dependencies]
tree-sitter = "0.22.6"
tree-sitter = "^0.24.5"
Comment on lines -23 to +18
Copy link

@varungandhi-src varungandhi-src Jan 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This is not more lenient than the previous range (the PR title says "more lenient tree-sitter dep range"). The meaning of 0.22.6 is 0.22.6 <= v < 0.23. The meaning of ^0.24.5 is 0.24.5 <= v < 0.25. So the ranges do not have overlap.

What is the reason for bumping the ranges here? Is it for the syntax highlighter in the monorepo?

Over there, we need all grammars to be compiled with the same version of tree-sitter. Right now, the Cargo.toml for the workspace in the monorepo requires 0.22.6 <= v < 0.23.

https://sourcegraph.sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/docker-images/syntax-highlighter/Cargo.toml?L50


[build-dependencies]
cc = "1.0"
cc = ">=1.0"
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tree-sitter-jsonnet",
"version": "0.0.1",
"version": "0.0.2",
"description": "jsonnet grammar for tree-sitter",
"main": "bindings/node",
"types": "bindings/node",
Expand All @@ -21,15 +21,15 @@
"node-gyp-build": "^4.8.0"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
"tree-sitter": "^0.22.4"
Copy link

Choose a reason for hiding this comment

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

This seems odd/unusual... Why is the library dependency version different from the CLI version below?

},
"peerDependenciesMeta": {
"tree_sitter": {
"optional": true
}
},
"devDependencies": {
"tree-sitter-cli": "^0.22.6",
"tree-sitter-cli": "^0.24.6",
"prebuildify": "^6.0.0"
},
"scripts": {
Expand All @@ -49,4 +49,4 @@
"injection-regex": "jsonnet"
}
]
}
}
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ build-backend = "setuptools.build_meta"
[project]
name = "tree-sitter-jsonnet"
description = "Jsonnet grammar for tree-sitter"
version = "0.0.1"
version = "0.0.2"
keywords = ["incremental", "parsing", "tree-sitter", "jsonnet"]
classifiers = [
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Topic :: Software Development :: Compilers",
"Topic :: Text Processing :: Linguistic",
"Typing :: Typed"
"Typing :: Typed",
]
requires-python = ">=3.8"
license.text = "MIT"
Expand All @@ -22,7 +22,7 @@ readme = "README.md"
Homepage = "https://github.com/tree-sitter/tree-sitter-jsonnet"

[project.optional-dependencies]
core = ["tree-sitter~=0.21"]
core = ["tree-sitter~=0.23"]

[tool.cibuildwheel]
build = "cp38-*"
Expand Down