From e47a9d3817bf5a35df0a701465fa87c736bc78b4 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Fri, 7 Feb 2025 09:41:10 -0700 Subject: [PATCH] chore: go back to bundling by default --- .github/workflows/ci.yaml | 14 -------------- .github/workflows/docs.yaml | 6 ------ .github/workflows/pypi.yaml | 8 ++++---- .gitignore | 1 + Cargo.lock | 1 + Cargo.toml | 4 ++++ 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb2ddf1..64c4ba2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,20 +26,6 @@ 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 diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 717699f..0b07dff 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -20,12 +20,6 @@ jobs: fetch-depth: 0 # to get gh-pages - uses: astral-sh/setup-uv@v3 - uses: Swatinem/rust-cache@v2 - - name: Download libduckdb - 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: Deploy diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index f3a7c06..47d8293 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -48,7 +48,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist -i 3.10 -i 3.11 -i 3.12 -i 3.13 -i pypy3.10 -F duckdb/bundled + args: --release --out dist -i 3.10 -i 3.11 -i 3.12 -i 3.13 -i pypy3.10 sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: ${{ matrix.platform.manylinux }} - name: Upload wheels @@ -79,7 +79,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist -i 3.10 -i 3.11 -i 3.12 -i 3.13 -i pypy3.10 -F duckdb/bundled + args: --release --out dist -i 3.10 -i 3.11 -i 3.12 -i 3.13 -i pypy3.10 sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: musllinux_1_2 - name: Upload wheels @@ -107,7 +107,7 @@ jobs: # uses: PyO3/maturin-action@v1 # with: # target: ${{ matrix.platform.target }} - # args: --release --out dist --find-interpreter -F duckdb/bundled + # args: --release --out dist --find-interpreter # sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} # - name: Upload wheels # uses: actions/upload-artifact@v4 @@ -133,7 +133,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist -i 3.10 -i 3.11 -i 3.12 -i 3.13 -i pypy3.10 -F duckdb/bundled + args: --release --out dist -i 3.10 -i 3.11 -i 3.12 -i 3.13 -i pypy3.10 sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - name: Upload wheels uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index c797cfa..ee6001d 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,4 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ +.vscode/ diff --git a/Cargo.lock b/Cargo.lock index 78f9250..77ffcc3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1819,6 +1819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac2de5219db852597558df5dcd617ffccd5cbd7b9f5402ccbf899aca6cb6047" dependencies = [ "autocfg", + "cc", "flate2", "pkg-config", "serde", diff --git a/Cargo.toml b/Cargo.toml index 3516c22..e2d4db5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,10 @@ publish = false name = "stacrs" crate-type = ["cdylib"] +[features] +default = ["duckdb-bundled"] +duckdb-bundled = ["duckdb/bundled"] + [dependencies] duckdb = { version = "1.1.1" } geojson = "0.24.1"