Skip to content

feat: move bundled just to wheels #22

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

Merged
merged 7 commits into from
Jan 17, 2025
Merged

feat: move bundled just to wheels #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b50d2e8
feat: move bundled just to wheels
gadomski Jan 17, 2025
ad12814
feat: begin guess-and-check
gadomski Jan 17, 2025
06dd599
feat: try more library path crap
gadomski Jan 17, 2025
c2b11cc
fix: i'm bad at condiationals
gadomski Jan 17, 2025
1d21ed9
fix: if statements
gadomski Jan 17, 2025
d8097a7
consolidate
gadomski Jan 17, 2025
24f2117
fix: move it back
gadomski Jan 17, 2025
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
15 changes: 15 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
name: Test
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
Expand All @@ -25,6 +26,20 @@ jobs:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v3
- uses: Swatinem/rust-cache@v2
- name: Download libduckdb (macos)
if: matrix.os == 'macos-latest'
run: |
wget https://github.com/duckdb/duckdb/releases/download/v1.1.3/libduckdb-osx-universal.zip
unzip libduckdb-osx-universal.zip -d libduckdb
echo "DYLD_LIBRARY_PATH=libduckdb" >> $GITHUB_ENV
echo "LIBRARY_PATH=libduckdb" >> $GITHUB_ENV
- name: Download libduckdb (ubuntu)
if: matrix.os == 'ubuntu-latest'
run: |
wget https://github.com/duckdb/duckdb/releases/download/v1.1.3/libduckdb-linux-amd64.zip
unzip libduckdb-linux-amd64.zip -d libduckdb
echo "LD_LIBRARY_PATH=libduckdb" >> $GITHUB_ENV
echo "LIBRARY_PATH=libduckdb" >> $GITHUB_ENV
- name: Sync
run: uv sync
- name: Lint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pypi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
args: --release --out dist --find-interpreter -F duckdb/bundled
sccache: "true"
manylinux: ${{ matrix.platform.manylinux }}
- name: Upload wheels
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
args: --release --out dist --find-interpreter -F duckdb/bundled
sccache: "true"
manylinux: musllinux_1_2
- name: Upload wheels
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
args: --release --out dist --find-interpreter -F duckdb/bundled
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v4
Expand Down
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "stacrs"
crate-type = ["cdylib"]

[dependencies]
duckdb = { version = "1.1.1", features = ["bundled"] }
duckdb = { version = "1.1.1" }
geojson = "0.24.1"
pyo3 = "0.23.4"
pyo3-async-runtimes = { version = "0.23.0", features = [
Expand Down
Loading