Skip to content

Commit 4f1f6e5

Browse files
itsjunetimealambJefffrey
authored
Update MSRVs to be accurate (#6742)
* 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 <andrew@nerdnetworks.org> Co-authored-by: Jeffrey Vo <jeffrey.vo.australia@gmail.com>
1 parent a160e94 commit 4f1f6e5

File tree

8 files changed

+14
-28
lines changed

8 files changed

+14
-28
lines changed

.github/workflows/rust.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -123,32 +123,18 @@ jobs:
123123
uses: ./.github/actions/setup-builder
124124
- name: Install cargo-msrv
125125
run: cargo install cargo-msrv
126-
- name: Downgrade arrow dependencies
127-
run: cargo update -p ahash --precise 0.8.7
128-
- name: Check arrow
129-
working-directory: arrow
130-
run: |
131-
# run `cd arrow; cargo msrv verify` to see problematic dependencies
132-
cargo msrv verify --output-format=json
133-
- name: Check parquet
134-
working-directory: parquet
135-
run: |
136-
# run `cd parquet; cargo msrv verify` to see problematic dependencies
137-
cargo msrv verify --output-format=json
138-
- name: Check arrow-flight
139-
working-directory: arrow-flight
140-
run: |
141-
# run `cd arrow-flight; cargo msrv verify` to see problematic dependencies
142-
cargo msrv verify --output-format=json
143126
- name: Downgrade object_store dependencies
144127
working-directory: object_store
145128
# Necessary because tokio 1.30.0 updates MSRV to 1.63
146129
# and url 2.5.1, updates to 1.67
147130
run: |
148131
cargo update -p tokio --precise 1.29.1
149132
cargo update -p url --precise 2.5.0
150-
- name: Check object_store
151-
working-directory: object_store
133+
- name: Check all packages
152134
run: |
153-
# run `cd object_store; cargo msrv verify` to see problematic dependencies
154-
cargo msrv verify --output-format=json
135+
# run `cargo msrv verify --manifest-path "path/to/Cargo.toml"` to see problematic dependencies
136+
find . -mindepth 2 -name Cargo.toml | while read -r dir
137+
do
138+
echo "Checking package '$dir'"
139+
cargo msrv verify --manifest-path "$dir" --output-format=json || exit 1
140+
done

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ include = [
7474
"Cargo.toml",
7575
]
7676
edition = "2021"
77-
rust-version = "1.62"
77+
rust-version = "1.70"
7878

7979
[workspace.dependencies]
8080
arrow = { version = "54.0.0", path = "./arrow", default-features = false }

arrow-flight/gen/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name = "gen"
2020
description = "Code generation for arrow-flight"
2121
version = "0.1.0"
2222
edition = { workspace = true }
23-
rust-version = { workspace = true }
23+
rust-version = "1.71.1"
2424
authors = { workspace = true }
2525
homepage = { workspace = true }
2626
repository = { workspace = true }

arrow-integration-testing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
edition = { workspace = true }
2727
publish = false
28-
rust-version = { workspace = true }
28+
rust-version = "1.75.0"
2929

3030
[lib]
3131
crate-type = ["lib", "cdylib"]

arrow-pyarrow-integration-testing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = ["Apache Arrow <dev@arrow.apache.org>"]
2525
license = "Apache-2.0"
2626
keywords = [ "arrow" ]
2727
edition = "2021"
28-
rust-version = "1.62"
28+
rust-version = "1.70"
2929
publish = false
3030

3131
[lib]

arrow-schema/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
2828
edition = { workspace = true }
29-
rust-version = { workspace = true }
29+
rust-version = "1.64"
3030

3131
[lib]
3232
name = "arrow_schema"

arrow/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include = [
3131
"Cargo.toml",
3232
]
3333
edition = { workspace = true }
34-
rust-version = "1.70.0"
34+
rust-version = { workspace = true }
3535

3636
[lib]
3737
name = "arrow"

parquet/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ authors = { workspace = true }
2626
keywords = ["arrow", "parquet", "hadoop"]
2727
readme = "README.md"
2828
edition = { workspace = true }
29-
rust-version = "1.70.0"
29+
rust-version = { workspace = true }
3030

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

0 commit comments

Comments
 (0)