diff --git a/.github/workflows/release-jupyter.yml b/.github/workflows/release-jupyter.yml index 32bb345a..6bf4628e 100644 --- a/.github/workflows/release-jupyter.yml +++ b/.github/workflows/release-jupyter.yml @@ -39,8 +39,8 @@ jobs: include: - target: x86_64 runner: ubuntu-latest - # - target: aarch64 - # runner: ubuntu-24.04-arm + - target: aarch64 + runner: ubuntu-24.04-arm env: GGSQL_SKIP_GENERATE: "1" steps: @@ -51,9 +51,6 @@ jobs: name: tree-sitter-generated path: tree-sitter-ggsql/src/ - - name: Install ODBC - run: sudo apt-get install -y unixodbc-dev - - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -62,6 +59,12 @@ jobs: working-directory: ggsql-jupyter manylinux: 2_28 docker-options: -e GGSQL_SKIP_GENERATE=1 + before-script-linux: | + if command -v yum >/dev/null 2>&1; then + yum install -y unixODBC-devel + elif command -v apt-get >/dev/null 2>&1; then + apt-get update && apt-get install -y unixodbc-dev + fi - uses: actions/upload-artifact@v4 with: diff --git a/Cargo.lock b/Cargo.lock index df29f0e2..0dd7c4d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1791,7 +1791,7 @@ dependencies = [ [[package]] name = "ggsql" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "arrow", @@ -1826,7 +1826,7 @@ dependencies = [ [[package]] name = "ggsql-jupyter" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "bytes", @@ -1851,7 +1851,7 @@ dependencies = [ [[package]] name = "ggsql-python" -version = "0.2.4" +version = "0.2.5" dependencies = [ "ggsql", "polars", @@ -1860,7 +1860,7 @@ dependencies = [ [[package]] name = "ggsql-wasm" -version = "0.2.4" +version = "0.2.5" dependencies = [ "csv", "ggsql", @@ -5822,7 +5822,7 @@ dependencies = [ [[package]] name = "tree-sitter-ggsql" -version = "0.2.4" +version = "0.2.5" dependencies = [ "cc", "tree-sitter", diff --git a/Cargo.toml b/Cargo.toml index 70650fb6..0820d0d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ default-members = [ resolver = "2" [workspace.package] -version = "0.2.4" +version = "0.2.5" edition = "2021" authors = ["ggsql Team"] license = "MIT" @@ -26,8 +26,8 @@ description = "A declarative visualization language that extends SQL with powerf [workspace.dependencies] # workspace packages -tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.2.4" } -ggsql = { path = "src", version = "0.2.4" } +tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.2.5" } +ggsql = { path = "src", version = "0.2.5" } # Parsing csscolorparser = "0.8.1" diff --git a/ggsql-jupyter/pyproject.toml b/ggsql-jupyter/pyproject.toml index d0d5e0d1..a740737a 100644 --- a/ggsql-jupyter/pyproject.toml +++ b/ggsql-jupyter/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "ggsql-jupyter" -version = "0.2.4" +version = "0.2.5" description = "Jupyter kernel for ggsql - SQL extension for declarative data visualization" readme = "README.md" license = { text = "MIT" } diff --git a/ggsql-python/Cargo.toml b/ggsql-python/Cargo.toml index 08296017..0eb5f267 100644 --- a/ggsql-python/Cargo.toml +++ b/ggsql-python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ggsql-python" -version = "0.2.4" +version = "0.2.5" edition = "2021" authors.workspace = true license.workspace = true diff --git a/ggsql-python/pyproject.toml b/ggsql-python/pyproject.toml index 18ef6c38..877b362a 100644 --- a/ggsql-python/pyproject.toml +++ b/ggsql-python/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "ggsql" -version = "0.2.4" +version = "0.2.5" description = "SQL extension for declarative data visualization" readme = "README.md" requires-python = ">=3.10" diff --git a/ggsql-python/python/ggsql/__init__.py b/ggsql-python/python/ggsql/__init__.py index af63547d..d1e36aa3 100644 --- a/ggsql-python/python/ggsql/__init__.py +++ b/ggsql-python/python/ggsql/__init__.py @@ -27,7 +27,7 @@ "execute", "render_altair", ] -__version__ = "0.2.4" +__version__ = "0.2.5" # Type alias for any Altair chart type AltairChart = Union[ diff --git a/ggsql-vscode/CHANGELOG.md b/ggsql-vscode/CHANGELOG.md index aa7a3e59..82c13de8 100644 --- a/ggsql-vscode/CHANGELOG.md +++ b/ggsql-vscode/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.2.5 + +Alpha release. + +- Install ODBC in manylinux container in GHA release workflows + ## 0.2.4 Alpha release. diff --git a/ggsql-vscode/package-lock.json b/ggsql-vscode/package-lock.json index d9aaa580..4dc96d1b 100644 --- a/ggsql-vscode/package-lock.json +++ b/ggsql-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "ggsql", - "version": "0.2.4", + "version": "0.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ggsql", - "version": "0.2.4", + "version": "0.2.5", "license": "MIT", "dependencies": { "toml": "^3.0.0" diff --git a/ggsql-vscode/package.json b/ggsql-vscode/package.json index 1c9c4ec1..d640b2c9 100644 --- a/ggsql-vscode/package.json +++ b/ggsql-vscode/package.json @@ -2,7 +2,7 @@ "name": "ggsql", "displayName": "ggsql", "description": "Syntax highlighting and language runtime for ggsql - SQL with declarative visualization", - "version": "0.2.4", + "version": "0.2.5", "publisher": "ggsql", "engines": { "vscode": "^1.75.0" diff --git a/ggsql-wasm/demo/package-lock.json b/ggsql-wasm/demo/package-lock.json index 073b9d87..89ae2f31 100644 --- a/ggsql-wasm/demo/package-lock.json +++ b/ggsql-wasm/demo/package-lock.json @@ -24,7 +24,7 @@ }, "../pkg": { "name": "ggsql-wasm", - "version": "0.2.4", + "version": "0.2.5", "license": "MIT" }, "node_modules/@esbuild/aix-ppc64": { diff --git a/tree-sitter-ggsql/bindings/python/__init__.py b/tree-sitter-ggsql/bindings/python/__init__.py index 98e38d41..7081eb3d 100644 --- a/tree-sitter-ggsql/bindings/python/__init__.py +++ b/tree-sitter-ggsql/bindings/python/__init__.py @@ -31,5 +31,5 @@ except Exception as e: raise ImportError(f"Could not load tree-sitter-ggsql language: {e}") -__version__ = "0.2.4" +__version__ = "0.2.5" __all__ = ["language"] diff --git a/tree-sitter-ggsql/package.json b/tree-sitter-ggsql/package.json index b2ba9c2b..abdea382 100644 --- a/tree-sitter-ggsql/package.json +++ b/tree-sitter-ggsql/package.json @@ -1,6 +1,6 @@ { "name": "tree-sitter-ggsql", - "version": "0.2.4", + "version": "0.2.5", "description": "Tree-sitter grammar for ggsql visualization language", "main": "bindings/node", "repository": { diff --git a/tree-sitter-ggsql/pyproject.toml b/tree-sitter-ggsql/pyproject.toml index e0696e97..067cf8c8 100644 --- a/tree-sitter-ggsql/pyproject.toml +++ b/tree-sitter-ggsql/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "tree-sitter-ggsql" -version = "0.2.4" +version = "0.2.5" description = "Tree-sitter grammar for ggsql visualization language" readme = "README.md" license = {text = "MIT"} diff --git a/tree-sitter-ggsql/tree-sitter.json b/tree-sitter-ggsql/tree-sitter.json index a9a7bd59..83ec1ee1 100644 --- a/tree-sitter-ggsql/tree-sitter.json +++ b/tree-sitter-ggsql/tree-sitter.json @@ -14,7 +14,7 @@ } ], "metadata": { - "version": "0.2.4", + "version": "0.2.5", "license": "MIT", "description": "ggsql grammar for tree-sitter", "authors": [