From 5fb8986dbde6c1e797f6e69df0498670fb02a250 Mon Sep 17 00:00:00 2001 From: skshetry <18718008+skshetry@users.noreply.github.com> Date: Thu, 5 Jun 2025 11:41:04 +0545 Subject: [PATCH] bench: check for dvc_bin.version instead of dvc_rev (#10764) * bench: check for dvc_bin.version instead of dvc_rev * Update dvc/testing/benchmarks/cli/stories/use_cases/test_sharing.py * Update dvc/testing/benchmarks/cli/stories/use_cases/test_sharing.py --- .../benchmarks/cli/stories/use_cases/test_sharing.py | 8 +++++--- pyproject.toml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dvc/testing/benchmarks/cli/stories/use_cases/test_sharing.py b/dvc/testing/benchmarks/cli/stories/use_cases/test_sharing.py index e50f0c355..2384404df 100644 --- a/dvc/testing/benchmarks/cli/stories/use_cases/test_sharing.py +++ b/dvc/testing/benchmarks/cli/stories/use_cases/test_sharing.py @@ -3,10 +3,12 @@ import shutil from packaging import version -def test_sharing(bench_dvc, tmp_dir, dvc, make_dataset, remote, dvc_rev): +def test_sharing(bench_dvc, tmp_dir, dvc, make_dataset, remote, dvc_bin): is_gs = dvc.config["remote"]["upstream"]["url"].startswith("gs://") - if dvc_rev and is_gs and version.Version(dvc_rev) < version.Version("3.59.3"): - # support for allow_anonymous_login in gs was introduced in dvc==3.59.3 + if is_gs and version.Version(dvc_bin.version) < version.Version("3.59.2"): + # support for allow_anonymous_login in gs was introduced in dvc==3.60 + # This should not impact the test, just that it will make it slower if used + # with fake-gcs-server. with dvc.config.edit() as d: d["remote"]["upstream"].pop("allow_anonymous_login", None) diff --git a/pyproject.toml b/pyproject.toml index 3ae2f8685..8a617e17d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -173,6 +173,7 @@ filterwarnings = [ "ignore:nx.nx_pydot.* depends on the pydot package, which has.*known issues and is not actively maintained:DeprecationWarning", # TODO: investigate where we are not closing sqlite3.Connection "ignore:unclosed database.*sqlite3.Connection:ResourceWarning", + "ignore:unclosed.*