Skip to content

Commit

Permalink
Merge pull request #540 from splitgraph/datafusion-31-upgrade
Browse files Browse the repository at this point in the history
DataFusion 31 and Arrow 46 upgrade
  • Loading branch information
wangxiaoying authored Sep 14, 2023
2 parents f1bcd57 + d226c0a commit 1e642af
Show file tree
Hide file tree
Showing 19 changed files with 285 additions and 299 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: stable
components: rustfmt
default: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# - name: Install Rust
# uses: actions-rs/toolchain@v1
# with:
# toolchain: 1.71.1
# toolchain: stable
# components: rustfmt
# default: true

Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: stable
components: rustfmt
default: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: stable
components: rustfmt
default: true

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: stable
components: rustfmt
target: aarch64-unknown-linux-gnu
default: true
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: PyO3/maturin-action@v1
with:
rust-toolchain: 1.71.1
rust-toolchain: stable
maturin-version: v0.14.15
command: build
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
Expand All @@ -58,7 +58,7 @@ jobs:
# rebuild the wheel to incorporate j4rs dependencies
- uses: PyO3/maturin-action@v1
with:
rust-toolchain: 1.71.1
rust-toolchain: stable
maturin-version: v0.14.15
command: build
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: stable
components: rustfmt
default: true

Expand All @@ -117,7 +117,7 @@ jobs:
- uses: PyO3/maturin-action@v1
with:
rust-toolchain: 1.71.1
rust-toolchain: stable
maturin-version: v0.14.15
command: build
args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
Expand All @@ -131,7 +131,7 @@ jobs:
# rebuild the wheel to incorporate j4rs dependencies
- uses: PyO3/maturin-action@v1
with:
rust-toolchain: 1.71.1
rust-toolchain: stable
maturin-version: v0.14.15
command: build
args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: stable
components: rustfmt
target: aarch64-apple-darwin
default: true
Expand All @@ -178,7 +178,7 @@ jobs:
- uses: PyO3/maturin-action@v1
with:
rust-toolchain: 1.71.1
rust-toolchain: stable
maturin-version: v0.14.15
command: build
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release --features integrated-auth-gssapi
Expand All @@ -192,7 +192,7 @@ jobs:
# rebuild the wheel to incorporate j4rs dependencies
- uses: PyO3/maturin-action@v1
with:
rust-toolchain: 1.71.1
rust-toolchain: stable
maturin-version: v0.14.15
command: build
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release --features integrated-auth-gssapi
Expand Down
Loading

0 comments on commit 1e642af

Please sign in to comment.