Bump to version 0.2.6 (#326)

* Set auditwheel=repair for Jupyter macOS builds

* Use dylibbundler to bundle libs on macOS

* Bump version to 0.2.6

Author: georgestagg

.github/workflows/release-jupyter.yml

@@ -98,7 +98,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist
+          args: --release --out dist --auditwheel=repair
           working-directory: ggsql-jupyter
 
       - uses: actions/upload-artifact@v4

.github/workflows/release-packages.yml

@@ -105,6 +105,9 @@ jobs:
       - name: Install ODBC
         run: brew install unixodbc
 
+      - name: Install dylibbundler
+        run: brew install dylibbundler
+
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -136,6 +139,11 @@ jobs:
       - name: Build ggsql binary (x86_64)
         run: cargo build --release --bin ggsql --bin ggsql-jupyter
 
+      - name: Bundle and sign dynamic library dependencies
+        run: |
+          dylibbundler -cd -of -b -x target/release/ggsql -d ./libs/ -p @executable_path/../Resources/libs/
+          dylibbundler -cd -of -b -x target/release/ggsql-jupyter -d ./libs/ -p @executable_path/../Resources/libs/
+
       - name: Ad-hoc sign binaries
         run: |
           codesign --force --sign - target/release/ggsql
@@ -175,6 +183,9 @@ jobs:
       - name: Install ODBC
         run: brew install unixodbc
 
+      - name: Install dylibbundler
+        run: brew install dylibbundler
+
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -206,6 +217,11 @@ jobs:
       - name: Build ggsql binary (aarch64)
         run: cargo build --release --bin ggsql --bin ggsql-jupyter
 
+      - name: Bundle and sign dynamic library dependencies
+        run: |
+          dylibbundler -cd -of -b -x target/release/ggsql -d ./libs/ -p @executable_path/../Resources/libs/
+          dylibbundler -cd -of -b -x target/release/ggsql-jupyter -d ./libs/ -p @executable_path/../Resources/libs/
+
       - name: Build DMG installer (aarch64)
         run: cargo packager --release --formats dmg
         env:
@@ -307,6 +323,9 @@ jobs:
       - name: Build ggsql binary (aarch64)
         run: cargo build --release --bin ggsql --bin ggsql-jupyter
 
+      - name: Make empty libs dir for bundling
+        run: mkdir -p libs
+
       - name: Build Debian package (aarch64)
         run: cargo packager --release --formats deb
 

Cargo.lock

@@ -16,7 +16,7 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.2.5"
+version = "0.2.6"
 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.5" }
-ggsql = { path = "src", version = "0.2.5" }
+tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.2.6" }
+ggsql = { path = "src", version = "0.2.6" }
 
 # Parsing
 csscolorparser = "0.8.1"

Cargo.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ggsql-jupyter"
-version = "0.2.5"
+version = "0.2.6"
 description = "Jupyter kernel for ggsql - SQL extension for declarative data visualization"
 readme = "README.md"
 license = { text = "MIT" }

ggsql-jupyter/pyproject.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ggsql-python"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 authors.workspace = true
 license.workspace = true

ggsql-python/Cargo.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ggsql"
-version = "0.2.5"
+version = "0.2.6"
 description = "SQL extension for declarative data visualization"
 readme = "README.md"
 requires-python = ">=3.10"

ggsql-python/pyproject.toml

@@ -27,7 +27,7 @@
     "execute",
     "render_altair",
 ]
-__version__ = "0.2.5"
+__version__ = "0.2.6"
 
 # Type alias for any Altair chart type
 AltairChart = Union[

ggsql-python/python/ggsql/__init__.py

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.2.6
+
+Alpha release.
+
+- Set auditwheel=repair for Jupyter macOS builds
+- Use dylibbundler to bundle libs on macOS
+
 ## 0.2.5
 
 Alpha release.