cql2 0.4.1__tar.gz → 0.5.2__tar.gz

{cql2-0.4.1 → cql2-0.5.2}/.github/dependabot.yml

@@ -1,22 +1,23 @@
 version: 2
+
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
   - package-ecosystem: "cargo"
-    directory: "/"
+    directories:
+      - "/"
+      - "/python"
+      - "/cli"
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+      development-dependencies:
+        dependency-type: "development"
     schedule:
       interval: "weekly"
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "weekly"
-  - package-ecosystem: "cargo"
-    directory: "/python"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "cargo"
-    directory: "/cli"
-    schedule:
-      interval: "weekly"

cql2-0.5.2/.github/workflows/ci.yml

@@ -0,0 +1,99 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      # We've run out of disk space while building libduckdb-sys, so this gives
+      # us more headroom in a quite hackey way.
+      - name: Free Disk Space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          df -h
+      - uses: actions/checkout@v6
+      - uses: Swatinem/rust-cache@v2
+      - name: Format
+        run: cargo fmt --check
+      - name: Check
+        run: cargo check --workspace
+      - name: Test
+        run: cargo test
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: Swatinem/rust-cache@v2
+      - name: Clippy
+        run: cargo clippy --workspace --tests -- -D warnings
+  test-python:
+    name: Test Python
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+    steps:
+      - uses: actions/checkout@v6
+      - uses: Swatinem/rust-cache@v2
+      - uses: astral-sh/setup-uv@v7
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Lint
+        run: |
+          uv run mypy python
+          uv run ruff check
+          uv run ruff format --check
+      - name: Test
+        run: uv run pytest
+      - name: CLI smoke test
+        run: uv run cql2 < examples/text/example01.txt
+  wasm-nodejs:
+    name: WASM (Node.js)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: Swatinem/rust-cache@v2
+      - name: Install wasm-pack
+        run: cargo install wasm-pack
+      - name: Build for Node.js
+        run: wasm-pack build --target nodejs wasm
+      - name: Test (Rust unit tests in Node.js)
+        run: wasm-pack test --node wasm
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: "20"
+      - name: Test (JavaScript integration tests)
+        run: npm --prefix wasm test
+  wasm-web:
+    name: WASM (web)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: Swatinem/rust-cache@v2
+      - name: Install wasm-pack
+        run: cargo install wasm-pack
+      - name: Build for web
+        run: wasm-pack build --target web wasm
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: "20"
+      - name: Test (JavaScript integration tests with web target)
+        run: npm --prefix wasm test
+      - name: Test (Rust unit tests in web)
+        run: wasm-pack test --headless --firefox wasm

{cql2-0.4.1 → cql2-0.5.2}/.github/workflows/docs.yml

@@ -17,16 +17,14 @@ jobs:
       GIT_COMMITTER_NAME: ci-bot
       GIT_COMMITTER_EMAIL: ci-bot@example.com
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # for git describe
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - name: Install wasm-pack
-        uses: jetli/wasm-pack-action@v0.4.0
-        with:
-          version: "latest"
+        run: cargo install wasm-pack
       - name: build wasm
         run: scripts/buildwasm
       - uses: astral-sh/setup-uv@v7

cql2-0.5.2/.github/workflows/npm.yml

@@ -0,0 +1,54 @@
+name: npm
+
+on:
+  push:
+    tags:
+      - "cql2-v*"
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build WASM package
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: Swatinem/rust-cache@v2
+      - name: Install wasm-pack
+        run: cargo install wasm-pack
+      - name: Build WASM for npm
+        run: wasm-pack build --target web --out-dir pkg wasm
+      - name: Upload package
+        uses: actions/upload-artifact@v6
+        with:
+          name: npm-package
+          path: wasm/pkg
+
+  publish:
+    name: Publish to npm
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      id-token: write
+      contents: read
+      attestations: write
+    environment:
+      name: npm
+      url: https://www.npmjs.com/package/cql2-wasm
+    steps:
+      - uses: actions/download-artifact@v7
+        with:
+          name: npm-package
+          path: package
+      - uses: actions/setup-node@v6
+        with:
+          node-version: "20"
+          registry-url: "https://registry.npmjs.org"
+      - name: Upgrade npm version
+        run: npm install -g npm@latest
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-path: "package/*"
+      - name: Publish to npm
+        working-directory: package
+        run: npm publish --provenance --access public

cql2-0.4.1/.github/workflows/python.yml → cql2-0.5.2/.github/workflows/pypi.yml

@@ -3,7 +3,7 @@ name: Python
 on:
   push:
     tags:
-      - "v*"
+      - "cql2-v*"
   workflow_dispatch:
 
 concurrency:
@@ -26,8 +26,8 @@ jobs:
           - s390x
           - ppc64le
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Build wheels
@@ -41,7 +41,7 @@ jobs:
           sccache: "true"
           manylinux: auto
       - name: Upload wheels
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: wheels-linux-${{ matrix.target }}
           path: dist
@@ -56,8 +56,8 @@ jobs:
           - aarch64
           - armv7
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Build wheels
@@ -68,7 +68,7 @@ jobs:
           sccache: "true"
           manylinux: musllinux_1_2
       - name: Upload wheels
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: wheels-musllinux-${{ matrix.target }}
           path: dist
@@ -81,8 +81,8 @@ jobs:
           - x64
           - x86
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
           architecture: ${{ matrix.target }}
@@ -93,7 +93,7 @@ jobs:
           args: --release --out dist -i 3.10
           sccache: "true"
       - name: Upload wheels
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: wheels-windows-${{ matrix.target }}
           path: dist
@@ -103,13 +103,13 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: macos-13
+          - runner: macos-15-intel
             target: x86_64
-          - runner: macos-14
+          - runner: macos-latest
             target: aarch64
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Build wheels
@@ -119,7 +119,7 @@ jobs:
           args: --release --out dist -i 3.10
           sccache: "true"
       - name: Upload wheels
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: wheels-macos-${{ matrix.platform.target }}
           path: dist
@@ -127,14 +127,14 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
           args: --out dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: wheels-sdist
           path: dist
@@ -148,8 +148,11 @@ jobs:
       id-token: write
       contents: write
       attestations: write
+    environment:
+      name: pypi
+      url: https://pypi.org/project/cql2/
     steps:
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v3
         with:
@@ -157,8 +160,6 @@ jobs:
       - name: Publish to PyPI
         if: startsWith(github.ref, 'refs/tags/')
         uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
         with:
           command: upload
           args: --non-interactive --skip-existing wheels-*/*

cql2-0.5.2/.github/workflows/release-plz.yml

@@ -0,0 +1,58 @@
+name: Release-plz
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-plz-release:
+    name: Release-plz release
+    if: ${{ github.repository_owner == 'developmentseed' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - &checkout
+        name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - &install-rust
+        name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - &get-app-token
+        uses: actions/create-github-app-token@v2.2.1
+        id: app-token
+        with:
+          app-id: ${{ secrets.DS_RELEASE_BOT_ID }}
+          private-key: ${{ secrets.DS_RELEASE_BOT_PRIVATE_KEY }}
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+  release-plz-pr:
+    name: Release-plz PR
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'developmentseed' }}
+    permissions:
+      contents: write
+      pull-requests: write
+      id-token: write
+    concurrency:
+      group: release-plz-${{ github.ref }}
+      cancel-in-progress: false
+    steps:
+      - *checkout
+      - *install-rust
+      - *get-app-token
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release-pr
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

{cql2-0.4.1 → cql2-0.5.2}/.gitignore

@@ -3,3 +3,4 @@ debug/
 **/*.rs.bk
 .cache
 site/
+wasm/pkg/

{cql2-0.4.1 → cql2-0.5.2}/CHANGELOG.md

@@ -6,6 +6,75 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.5.2](https://github.com/developmentseed/cql2-rs/compare/cql2-v0.5.1...cql2-v0.5.2) - 2026-01-16
+
+### Fixed
+
+- one element lists ([#160](https://github.com/developmentseed/cql2-rs/pull/160))
+
+### Other
+
+- *(deps)* bump the production-dependencies group across 1 directory with 6 updates ([#158](https://github.com/developmentseed/cql2-rs/pull/158))
+
+## [0.5.1](https://github.com/developmentseed/cql2-rs/compare/cql2-v0.5.0...cql2-v0.5.1) - 2026-01-05
+
+### Added
+
+- *(wasm)* add to_ducksql ([#156](https://github.com/developmentseed/cql2-rs/pull/156))
+
+### Other
+
+- *(deps)* bump the production-dependencies group across 1 directory with 7 updates ([#155](https://github.com/developmentseed/cql2-rs/pull/155))
+- *(deps)* bump the production-dependencies group across 1 directory with 6 updates ([#154](https://github.com/developmentseed/cql2-rs/pull/154))
+- *(deps)* bump the production-dependencies group across 1 directory with 4 updates ([#152](https://github.com/developmentseed/cql2-rs/pull/152))
+- *(deps)* bump actions/download-artifact from 6 to 7 ([#147](https://github.com/developmentseed/cql2-rs/pull/147))
+- *(deps)* bump actions/create-github-app-token from 2.0.6 to 2.2.1 ([#148](https://github.com/developmentseed/cql2-rs/pull/148))
+- *(deps)* bump actions/upload-artifact from 5 to 6 ([#149](https://github.com/developmentseed/cql2-rs/pull/149))
+- *(deps)* bump the production-dependencies group across 1 directory with 5 updates ([#150](https://github.com/developmentseed/cql2-rs/pull/150))
+
+## [0.5.0](https://github.com/developmentseed/cql2-rs/compare/cql2-v0.4.2...cql2-v0.5.0) - 2025-12-08
+
+### Added
+
+- add __str__ and __repr__ ([#122](https://github.com/developmentseed/cql2-rs/pull/122))
+- add __version__ to python module ([#121](https://github.com/developmentseed/cql2-rs/pull/121))
+
+### Fixed
+
+- *(ci)* remove locked check ([#125](https://github.com/developmentseed/cql2-rs/pull/125))
+- it wasn't used anywhere and it was broken ([#124](https://github.com/developmentseed/cql2-rs/pull/124))
+- *(ci)* update to latest npm for publishing
+- *(ci)* remove clean install from npm publish
+
+### Other
+
+- use release bot for releasing ([#145](https://github.com/developmentseed/cql2-rs/pull/145))
+- *(deps)* bump the production-dependencies group across 1 directory with 3 updates ([#144](https://github.com/developmentseed/cql2-rs/pull/144))
+- fix ci config ([#143](https://github.com/developmentseed/cql2-rs/pull/143))
+- *(deps)* bump the production-dependencies group with 3 updates ([#142](https://github.com/developmentseed/cql2-rs/pull/142))
+- add release-plz workflow ([#140](https://github.com/developmentseed/cql2-rs/pull/140))
+- *(deps)* bump the production-dependencies group with 6 updates ([#138](https://github.com/developmentseed/cql2-rs/pull/138))
+- *(deps)* bump actions/checkout from 5 to 6 ([#134](https://github.com/developmentseed/cql2-rs/pull/134))
+- try groups ([#136](https://github.com/developmentseed/cql2-rs/pull/136))
+- group dependencies ([#135](https://github.com/developmentseed/cql2-rs/pull/135))
+- *(ci)* actually keep the locked check ([#127](https://github.com/developmentseed/cql2-rs/pull/127))
+- *(deps)* bump actions/setup-node from 4 to 6 ([#126](https://github.com/developmentseed/cql2-rs/pull/126))
+- *(wasm)* [**breaking**] Make WASM module interface more like Python module ([#120](https://github.com/developmentseed/cql2-rs/pull/120))
+- update cargo lock
+
+### Changed
+
+- Normalized WASM interface to match Python API ([#120](https://github.com/developmentseed/cql2-rs/pull/120))
+  - Renamed `CQL2` to `Expr` for consistency with Python
+  - Changed `Expr.matches()` and `Expr.reduce()` to accept JS objects instead of strings
+  - Changed `Expr.to_json()` to return JS objects instead of strings
+
+## [0.4.2] - 2025-11-12
+
+### Changed
+
+- Better package metadata and automated releasing
+
 ## [0.4.1] - 2025-10-31
 
 ## Changed
@@ -113,7 +182,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 Initial release.
 
-[Unreleased]: https://github.com/developmentseed/cql2-rs/compare/v0.4.1...main
+[Unreleased]: https://github.com/developmentseed/cql2-rs/compare/v0.4.2...main
+[0.4.2]: https://github.com/developmentseed/cql2-rs/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/developmentseed/cql2-rs/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/developmentseed/cql2-rs/compare/v0.3.8...v0.4.0
 [0.3.8]: https://github.com/developmentseed/cql2-rs/compare/v0.3.7...v0.3.8