This is an automated email from the ASF dual-hosted git repository.
milenkovicm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-ballista.git
The following commit(s) were added to refs/heads/main by this push:
new 1bc171ea add msrvcheck (#1328)
1bc171ea is described below
commit 1bc171ea223b4a199571115067e0f6bf51c9aecc
Author: killzoner <[email protected]>
AuthorDate: Thu Oct 16 21:18:27 2025 +0200
add msrvcheck (#1328)
---
.github/workflows/dependencies.yml | 58 +++++++++++++++++++++++++++++++
Cargo.toml | 2 +-
dev/msrvcheck/.gitignore | 1 +
dev/msrvcheck/Cargo.toml | 26 ++++++++++++++
dev/msrvcheck/README.md | 23 ++++++++++++
dev/msrvcheck/src/main.rs | 71 ++++++++++++++++++++++++++++++++++++++
6 files changed, 180 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/dependencies.yml
b/.github/workflows/dependencies.yml
new file mode 100644
index 00000000..6e8441bd
--- /dev/null
+++ b/.github/workflows/dependencies.yml
@@ -0,0 +1,58 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Dependencies
+
+concurrency:
+ group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{
github.workflow }}
+ cancel-in-progress: true
+
+on:
+ push:
+ branches-ignore:
+ - 'gh-readonly-queue/**'
+ paths:
+ - "**/Cargo.toml"
+ - "**/Cargo.lock"
+ pull_request:
+ paths:
+ - "**/Cargo.toml"
+ - "**/Cargo.lock"
+ merge_group:
+ # manual trigger
+ #
https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
+ workflow_dispatch:
+
+jobs:
+ depcheck:
+ name: msrv dependency check
+ runs-on: ubuntu-latest
+ container:
+ image: amd64/rust
+ steps:
+ - uses: actions/checkout@v5
+ with:
+ submodules: true
+ fetch-depth: 1
+ - name: Setup Rust toolchain
+ uses: ./.github/actions/setup-builder
+ with:
+ rust-version: stable
+ - name: Check dependencies
+ run: |
+ cd dev/msrvcheck
+ cargo run
diff --git a/Cargo.toml b/Cargo.toml
index 3dc2fd1b..49e35af1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[workspace]
-exclude = ["python"]
+exclude = ["dev/msrvcheck", "python"]
members = ["ballista-cli", "ballista/client", "ballista/core",
"ballista/executor", "ballista/scheduler", "benchmarks", "examples"]
resolver = "2"
diff --git a/dev/msrvcheck/.gitignore b/dev/msrvcheck/.gitignore
new file mode 100644
index 00000000..03314f77
--- /dev/null
+++ b/dev/msrvcheck/.gitignore
@@ -0,0 +1 @@
+Cargo.lock
diff --git a/dev/msrvcheck/Cargo.toml b/dev/msrvcheck/Cargo.toml
new file mode 100644
index 00000000..9ab2e388
--- /dev/null
+++ b/dev/msrvcheck/Cargo.toml
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# MSRV checker for upstream DataFusion
+[package]
+name = "msrvcheck"
+edition = "2021"
+
+# See more keys and their definitions at
https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cargo = "0.91.0"
diff --git a/dev/msrvcheck/README.md b/dev/msrvcheck/README.md
new file mode 100644
index 00000000..8b66e06a
--- /dev/null
+++ b/dev/msrvcheck/README.md
@@ -0,0 +1,23 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+This directory contains a tool that ensures there MSRV is consistent with
upstream
+datafusion dependencies.
+
+[issue 1271]:
https://github.com/apache/datafusion-ballista/issues/1271#issuecomment-3094456313
diff --git a/dev/msrvcheck/src/main.rs b/dev/msrvcheck/src/main.rs
new file mode 100644
index 00000000..1773a7c9
--- /dev/null
+++ b/dev/msrvcheck/src/main.rs
@@ -0,0 +1,71 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use cargo::CargoResult;
+use std::env;
+use std::path::Path;
+
+use cargo::util::context::GlobalContext;
+
+/// Verifies that we are tracking the right MSRV from datafusion.
+/// This is vastly inspired from
<https://github.com/apache/datafusion/tree/10a437b826568c27b81d7d16a02b938a13d1a4ad/dev/depcheck>
+fn main() -> CargoResult<()> {
+ let gctx = GlobalContext::default()?;
+ // This is the path for the depcheck binary
+ let path = env::var("CARGO_MANIFEST_DIR").unwrap();
+ let root_cargo_toml = Path::new(&path)
+ // dev directory
+ .parent()
+ .expect("Can not find dev directory")
+ // project root directory
+ .parent()
+ .expect("Can not find project root directory")
+ .join("Cargo.toml");
+
+ println!(
+ "Checking for MSRV dependencies in {}",
+ root_cargo_toml.display()
+ );
+
+ let workspace = cargo::core::Workspace::new(&root_cargo_toml, &gctx)?;
+ let project_msrv = workspace.lowest_rust_version().unwrap(); // there
should be a MSRV project wise
+
+ let (_, resolve) = cargo::ops::resolve_ws(&workspace, false)?;
+ let packages_with_rust_version: Vec<_> = resolve
+ .iter()
+ .filter(|id| id.name().starts_with("datafusion"))
+ .map(|e| resolve.summary(e))
+ .map(|e| (e.name(), e.rust_version()))
+ .collect();
+
+ println!("Current project MSRV: {}", project_msrv);
+
+ for (package, version) in packages_with_rust_version {
+ if let Some(v) = version {
+ if !v.is_compatible_with(project_msrv.as_partial()) {
+ panic!(
+ "package '{package}' has MSRV {v} not compatible with
current project MSRV {project_msrv}",
+ );
+ }
+
+ println!("{package} MSRV: {v}");
+ }
+ }
+
+ println!("No inconsistent MSRV found");
+ Ok(())
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
