Skip to content

Commit

Permalink
Update MSRVs to be accurate (#6742)
Browse files Browse the repository at this point in the history
* Update most MSRVs

* Make cargo-msrv verify every package in repo instead of just a select few and purposefully break arrow-flight msrv

* Add test to ensure workspace rust version is being used at least somewhere

* Fix exit1 => exit 1

* Make arrow-flight work, at the very least, with 'cargo metadata'

* Fix arrow-flight/gen rust-version to make CI pass now

* Get rid of pretty msrv logging as it can't all be displayed

* Do '-mindepth 2' with find to prevent running cargo msrv on the workspace as a whole

* Use correct MSRV for object_store

* remove workspace msrv check

* revert msrv

* push object_store MSRV back down to 1.62.1

* Revert unrelated formatting changes

* Fix object_store msrv

---------

Co-authored-by: Andrew Lamb <[email protected]>
Co-authored-by: Jeffrey Vo <[email protected]>
  • Loading branch information
3 people authored Jan 6, 2025
1 parent a160e94 commit 4f1f6e5
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 28 deletions.
28 changes: 7 additions & 21 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,32 +123,18 @@ jobs:
uses: ./.github/actions/setup-builder
- name: Install cargo-msrv
run: cargo install cargo-msrv
- name: Downgrade arrow dependencies
run: cargo update -p ahash --precise 0.8.7
- name: Check arrow
working-directory: arrow
run: |
# run `cd arrow; cargo msrv verify` to see problematic dependencies
cargo msrv verify --output-format=json
- name: Check parquet
working-directory: parquet
run: |
# run `cd parquet; cargo msrv verify` to see problematic dependencies
cargo msrv verify --output-format=json
- name: Check arrow-flight
working-directory: arrow-flight
run: |
# run `cd arrow-flight; cargo msrv verify` to see problematic dependencies
cargo msrv verify --output-format=json
- name: Downgrade object_store dependencies
working-directory: object_store
# Necessary because tokio 1.30.0 updates MSRV to 1.63
# and url 2.5.1, updates to 1.67
run: |
cargo update -p tokio --precise 1.29.1
cargo update -p url --precise 2.5.0
- name: Check object_store
working-directory: object_store
- name: Check all packages
run: |
# run `cd object_store; cargo msrv verify` to see problematic dependencies
cargo msrv verify --output-format=json
# run `cargo msrv verify --manifest-path "path/to/Cargo.toml"` to see problematic dependencies
find . -mindepth 2 -name Cargo.toml | while read -r dir
do
echo "Checking package '$dir'"
cargo msrv verify --manifest-path "$dir" --output-format=json || exit 1
done
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ include = [
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
rust-version = "1.70"

[workspace.dependencies]
arrow = { version = "54.0.0", path = "./arrow", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion arrow-flight/gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name = "gen"
description = "Code generation for arrow-flight"
version = "0.1.0"
edition = { workspace = true }
rust-version = { workspace = true }
rust-version = "1.71.1"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion arrow-integration-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ authors = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
publish = false
rust-version = { workspace = true }
rust-version = "1.75.0"

[lib]
crate-type = ["lib", "cdylib"]
Expand Down
2 changes: 1 addition & 1 deletion arrow-pyarrow-integration-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = [ "arrow" ]
edition = "2021"
rust-version = "1.62"
rust-version = "1.70"
publish = false

[lib]
Expand Down
2 changes: 1 addition & 1 deletion arrow-schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
rust-version = "1.64"

[lib]
name = "arrow_schema"
Expand Down
2 changes: 1 addition & 1 deletion arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ include = [
"Cargo.toml",
]
edition = { workspace = true }
rust-version = "1.70.0"
rust-version = { workspace = true }

[lib]
name = "arrow"
Expand Down
2 changes: 1 addition & 1 deletion parquet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ authors = { workspace = true }
keywords = ["arrow", "parquet", "hadoop"]
readme = "README.md"
edition = { workspace = true }
rust-version = "1.70.0"
rust-version = { workspace = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
ahash = { version = "0.8", default-features = false, features = ["compile-time-rng"] }
Expand Down

0 comments on commit 4f1f6e5

Please sign in to comment.