Apache DataFusion SQL Query Engine
chore: bump testcontainers-modules to 0.14 and remove testcontainers dep (#19620)
Jeffrey Vo09455f181480
diff --git a/Cargo.lock b/Cargo.lockindex b9dbd37463..204cf51f46 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1103,9 +1103,9 @@ dependencies = [[[package]]name = "bollard"-version = "0.19.3"+version = "0.19.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ec7646ee90964aa59e9f832a67182791396a19a5b1d76eb17599a8310a7e2e09"+checksum = "87a52479c9237eb04047ddb94788c41ca0d26eaff8b697ecfbb4c32f7fdc3b1b"dependencies = ["async-stream","base64 0.22.1",@@ -1979,7 +1979,6 @@ dependencies = ["regex","rstest","rustyline",- "testcontainers","testcontainers-modules","tokio","url",@@ -2729,7 +2728,6 @@ dependencies = ["sqllogictest","sqlparser","tempfile",- "testcontainers","testcontainers-modules","thiserror","tokio",@@ -2985,13 +2983,12 @@ checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"[[package]]name = "etcetera"-version = "0.10.0"+version = "0.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6"+checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"dependencies = ["cfg-if",- "home",- "windows-sys 0.59.0",+ "windows-sys 0.61.0",][[package]]@@ -3017,6 +3014,17 @@ dependencies = ["windows-sys 0.59.0",]+[[package]]+name = "ferroid"+version = "0.8.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bb330bbd4cb7a5b9f559427f06f98a4f853a137c8298f3bd3f8ca57663e21986"+dependencies = [+ "portable-atomic",+ "rand 0.9.2",+ "web-time",+]+[[package]]name = "ffi_example_table_provider"version = "0.1.0"@@ -4687,9 +4695,9 @@ dependencies = [[[package]]name = "portable-atomic"-version = "1.11.1"+version = "1.13.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"[[package]]name = "portable-atomic-util"@@ -6128,9 +6136,9 @@ dependencies = [[[package]]name = "testcontainers"-version = "0.25.2"+version = "0.26.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3f3ac71069f20ecfa60c396316c283fbf35e6833a53dff551a31b5458da05edc"+checksum = "a81ec0158db5fbb9831e09d1813fe5ea9023a2b5e6e8e0a5fe67e2a820733629"dependencies = ["astral-tokio-tar","async-trait",@@ -6139,7 +6147,9 @@ dependencies = ["docker_credential","either","etcetera",+ "ferroid","futures",+ "itertools 0.14.0","log","memchr","parse-display",@@ -6151,15 +6161,14 @@ dependencies = ["tokio","tokio-stream","tokio-util",- "ulid","url",][[package]]name = "testcontainers-modules"-version = "0.13.0"+version = "0.14.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1966329d5bb3f89d33602d2db2da971fb839f9297dad16527abf4564e2ae0a6d"+checksum = "5e75e78ff453128a2c7da9a5d5a3325ea34ea214d4bf51eab3417de23a4e5147"dependencies = ["testcontainers",]@@ -6635,16 +6644,6 @@ dependencies = ["typify-impl",]-[[package]]-name = "ulid"-version = "1.2.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe"-dependencies = [- "rand 0.9.2",- "web-time",-]-[[package]]name = "unicode-bidi"version = "0.3.18"diff --git a/Cargo.toml b/Cargo.tomlindex d801bb6114..b1d61b289e 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -185,8 +185,7 @@ sqlparser = { version = "0.59.0", default-features = false, features = ["std", "strum = "0.27.2"strum_macros = "0.27.2"tempfile = "3"-testcontainers = { version = "0.25.2", features = ["default"] }-testcontainers-modules = { version = "0.13" }+testcontainers-modules = { version = "0.14" }tokio = { version = "1.48", features = ["macros", "rt", "sync"] }url = "2.5.7"zstd = { version = "0.13", default-features = false }diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.tomlindex 67cb10081c..31941d8716 100644--- a/datafusion-cli/Cargo.toml+++ b/datafusion-cli/Cargo.toml@@ -74,5 +74,4 @@ ctor = { workspace = true }insta = { workspace = true }insta-cmd = "0.6.0"rstest = { workspace = true }-testcontainers = { workspace = true }testcontainers-modules = { workspace = true, features = ["minio"] }diff --git a/datafusion-cli/tests/cli_integration.rs b/datafusion-cli/tests/cli_integration.rsindex d6f8deedfe..8b8b786d65 100644--- a/datafusion-cli/tests/cli_integration.rs+++ b/datafusion-cli/tests/cli_integration.rs@@ -24,10 +24,12 @@ use insta::{Settings, glob};use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};use std::path::PathBuf;use std::{env, fs};-use testcontainers::core::{CmdWaitFor, ExecCommand, Mount};-use testcontainers::runners::AsyncRunner;-use testcontainers::{ContainerAsync, ImageExt, TestcontainersError};use testcontainers_modules::minio;+use testcontainers_modules::testcontainers::core::{CmdWaitFor, ExecCommand, Mount};+use testcontainers_modules::testcontainers::runners::AsyncRunner;+use testcontainers_modules::testcontainers::{+ ContainerAsync, ImageExt, TestcontainersError,+};fn cli() -> Command {Command::new(get_cargo_bin("datafusion-cli"))diff --git a/datafusion/sqllogictest/Cargo.toml b/datafusion/sqllogictest/Cargo.tomlindex f148892eca..a26a1d4422 100644--- a/datafusion/sqllogictest/Cargo.toml+++ b/datafusion/sqllogictest/Cargo.toml@@ -63,7 +63,6 @@ rust_decimal = { version = "1.38.0", features = ["tokio-pg"] }sqllogictest = "0.28.4"sqlparser = { workspace = true }tempfile = { workspace = true }-testcontainers = { workspace = true, optional = true }testcontainers-modules = { workspace = true, features = ["postgres"], optional = true }thiserror = "2.0.17"tokio = { workspace = true }@@ -77,7 +76,6 @@ postgres = ["chrono","postgres-types","postgres-protocol",- "testcontainers","testcontainers-modules","tokio-postgres",]diff --git a/datafusion/sqllogictest/bin/postgres_container.rs b/datafusion/sqllogictest/bin/postgres_container.rsindex e5addf5408..fde5937760 100644--- a/datafusion/sqllogictest/bin/postgres_container.rs+++ b/datafusion/sqllogictest/bin/postgres_container.rs@@ -23,10 +23,10 @@ use std::env::set_var;use std::future::Future;use std::sync::LazyLock;use std::{env, thread};-use testcontainers::ImageExt;-use testcontainers::core::IntoContainerPort;-use testcontainers::runners::AsyncRunner;use testcontainers_modules::postgres;+use testcontainers_modules::testcontainers::ImageExt;+use testcontainers_modules::testcontainers::core::IntoContainerPort;+use testcontainers_modules::testcontainers::runners::AsyncRunner;use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};use tokio::sync::{Mutex, mpsc};