Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand All @@ -18,4 +19,4 @@ version: 2
- package-ecosystem: "cargo"
directory: "/cli"
schedule:
interval: "weekly"
interval: "weekly"
23 changes: 15 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,30 @@ jobs:
test:
name: Test
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy
- name: Install wasm-pack
uses: jetli/wasm-pack-action@v0.4.0
with:
version: "latest"
- uses: Swatinem/rust-cache@v2
- uses: astral-sh/setup-uv@v3
with:
python-version: ${{ matrix.python-version }}
- name: Lint
run: scripts/lint
- name: Test
run: scripts/test
- name: CLI smoke test
run: uv run cql2 < examples/text/example01.txt
build-wasm:
name: Build wasm
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
- name: Install wasm-pack
uses: jetli/wasm-pack-action@v0.4.0
with:
version: "latest"
- name: Build WASM
run: scripts/buildwasm
78 changes: 33 additions & 45 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,99 +15,87 @@ permissions:

jobs:
linux:
runs-on: ${{ matrix.platform.runner }}
runs-on: ubuntu-latest
strategy:
matrix:
platform:
- runner: ubuntu-latest
target: x86_64
- runner: ubuntu-latest
target: x86
- runner: ubuntu-latest
target: aarch64
- runner: ubuntu-latest
target: armv7
- runner: ubuntu-latest
target: s390x
- runner: ubuntu-latest
target: ppc64le
target:
- x86_64
- x86
- aarch64
- armv7
- s390x
- ppc64le
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
python-version: 3.11
- name: Build wheels
uses: PyO3/maturin-action@v1
env:
# https://github.com/rust-lang/stacker/issues/79#issuecomment-1497479267
CFLAGS_s390x_unknown_linux_gnu: -march=z10
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
target: ${{ matrix.target }}
args: --release --out dist -i 3.11 -F pyo3/abi3-py311
sccache: "true"
manylinux: auto
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
name: wheels-linux-${{ matrix.platform.target }}
name: wheels-linux-${{ matrix.target }}
path: dist

musllinux:
runs-on: ${{ matrix.platform.runner }}
runs-on: ubuntu-latest
strategy:
matrix:
platform:
- runner: ubuntu-latest
target: x86_64
- runner: ubuntu-latest
target: x86
- runner: ubuntu-latest
target: aarch64
- runner: ubuntu-latest
target: armv7
target:
- x86_64
- x86
- aarch64
- armv7
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
python-version: 3.11
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
target: ${{ matrix.target }}
args: --release --out dist -i 3.11 -F pyo3/abi3-py311
sccache: "true"
manylinux: musllinux_1_2
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
name: wheels-musllinux-${{ matrix.platform.target }}
name: wheels-musllinux-${{ matrix.target }}
path: dist

windows:
runs-on: ${{ matrix.platform.runner }}
runs-on: windows-latest
strategy:
matrix:
platform:
- runner: windows-latest
target: x64
- runner: windows-latest
target: x86
target:
- x64
- x86
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
architecture: ${{ matrix.platform.target }}
python-version: 3.11
architecture: ${{ matrix.target }}
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
target: ${{ matrix.target }}
args: --release --out dist -i 3.11 -F pyo3/abi3-py311
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
name: wheels-windows-${{ matrix.platform.target }}
name: wheels-windows-${{ matrix.target }}
path: dist

macos:
Expand All @@ -123,12 +111,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
python-version: 3.11
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
args: --release --out dist -i 3.11 -F pyo3/abi3-py311
Copy link
Member

Choose a reason for hiding this comment

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

IMO it's slightly nicer to put the feature flag into Cargo.toml

Is there a feature in py3.11 that you need? Or you wanted to bump past 3.10 anyways?

sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v4
Expand Down
Loading
Loading