From 6ff4342f0265c827f2f24267ce306ba5cd6fa333 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 6 Dec 2023 11:51:05 +0200 Subject: [PATCH] deps: bump dvc-data to >=2.22.4 (#10139) * deps: bump dvc-data to >=2.22.4 * Update test_odb.py --- pyproject.toml | 2 +- tests/func/test_odb.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c5402434c..5ff090acd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "configobj>=5.0.6", "distro>=1.3", "dpath<3,>=2.1.0", - "dvc-data>=2.22.1,<2.23.0", + "dvc-data>=2.22.4,<2.23.0", "dvc-http>=2.29.0", "dvc-render>=1.0.0,<2", "dvc-studio-client>=0.17.1,<1", diff --git a/tests/func/test_odb.py b/tests/func/test_odb.py index 49b6391a4..ac2d98339 100644 --- a/tests/func/test_odb.py +++ b/tests/func/test_odb.py @@ -165,7 +165,7 @@ def test_default_cache_type(dvc): @pytest.mark.skipif(os.name == "nt", reason="Not supported for Windows.") @pytest.mark.parametrize("group", [False, True]) def test_shared_cache(tmp_dir, dvc, group): - from dvc.fs import system + from dvc_data.hashfile.db.local import umask if group: with dvc.config.edit() as conf: @@ -178,7 +178,7 @@ def test_shared_cache(tmp_dir, dvc, group): tmp_dir.dvc_gen({"file": "file content", "dir": {"file2": "file 2 content"}}) file_mode = oct(0o444) - dir_mode = oct(0o2775 if group else (0o777 & ~system.umask)) + dir_mode = oct(0o2775 if group else (0o777 & ~umask)) for root, dnames, fnames in os.walk(cache_dir): for dname in dnames: path = os.path.join(root, dname)