Skip to content

Commit

Permalink
Merge remote-tracking branch 'apache/main' into dev/xinli/agg_null
Browse files Browse the repository at this point in the history
  • Loading branch information
alamb committed Aug 8, 2024
2 parents 379ab5f + 1f35b03 commit e439222
Show file tree
Hide file tree
Showing 122 changed files with 3,871 additions and 2,240 deletions.
38 changes: 24 additions & 14 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,7 @@ jobs:
with:
rust-version: stable
- name: Run cargo doc
run: |
export RUSTDOCFLAGS="-D warnings"
cargo doc --document-private-items --no-deps --workspace
cd datafusion-cli
cargo doc --document-private-items --no-deps
run: ci/scripts/rust_docs.sh

linux-wasm-pack:
name: build with wasm-pack
Expand Down Expand Up @@ -566,18 +562,32 @@ jobs:
- name: Check datafusion
working-directory: datafusion/core
run: |
# If you encounter an error with any of the commands below
# it means some crate in your dependency tree has a higher
# MSRV (Min Supported Rust Version) than the one specified
# in the `rust-version` key of `Cargo.toml`. Check your
# dependencies or update the version in `Cargo.toml`
cargo msrv verify
# If you encounter an error with any of the commands below it means
# your code or some crate in the dependency tree has a higher MSRV
# (Min Supported Rust Version) than the one specified in the
# `rust-version` key of `Cargo.toml`.
#
# To reproduce:
# 1. Install the version of Rust that is failing. Example:
# rustup install 1.76.0
# 2. Run the command that failed with that version. Example:
# cargo +1.76.0 check -p datafusion
#
# To resolve, either:
# 1. Change your code to use older Rust features,
# 2. Revert dependency update
# 3. Update the MSRV version in `Cargo.toml`
#
# Please see the DataFusion Rust Version Compatibility Policy before
# updating Cargo.toml. You may have to update the code instead.
# https://github.com/apache/datafusion/blob/main/README.md#rust-version-compatibility-policy
cargo msrv --output-format json --log-target stdout verify
- name: Check datafusion-substrait
working-directory: datafusion/substrait
run: cargo msrv verify
run: cargo msrv --output-format json --log-target stdout verify
- name: Check datafusion-proto
working-directory: datafusion/proto
run: cargo msrv verify
run: cargo msrv --output-format json --log-target stdout verify
- name: Check datafusion-cli
working-directory: datafusion-cli
run: cargo msrv verify
run: cargo msrv --output-format json --log-target stdout verify
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ indexmap = "2.0.0"
itertools = "0.12"
log = "^0.4"
num_cpus = "1.13.0"
object_store = { version = "0.10.1", default-features = false }
object_store = { version = "0.10.2", default-features = false }
parking_lot = "0.12"
parquet = { version = "52.2.0", default-features = false, features = [
"arrow",
Expand All @@ -125,7 +125,7 @@ parquet = { version = "52.2.0", default-features = false, features = [
] }
rand = "0.8"
regex = "1.8"
rstest = "0.21.0"
rstest = "0.22.0"
serde_json = "1"
sqlparser = { version = "0.49", features = ["visitor"] }
tempfile = "3"
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/rust_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# under the License.

set -ex
export RUSTDOCFLAGS="-D warnings -A rustdoc::private-intra-doc-links"
export RUSTDOCFLAGS="-D warnings"
cargo doc --document-private-items --no-deps --workspace
cd datafusion-cli
cargo doc --document-private-items --no-deps
Loading

0 comments on commit e439222

Please sign in to comment.