From cbc8911863c937aebbe6524aa44525ab172fadb0 Mon Sep 17 00:00:00 2001 From: daavoo Date: Thu, 25 May 2023 09:32:48 +0200 Subject: [PATCH] repro: Skip pulling run cache if `no-run-cache` was passed. (cherry picked from commit 5a6f834088f7755973de8be06ad9b108bc436eb5) --- dvc/repo/reproduce.py | 6 +++--- tests/func/test_repro_multistage.py | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dvc/repo/reproduce.py b/dvc/repo/reproduce.py index b9cb360c0..43d9a27dd 100644 --- a/dvc/repo/reproduce.py +++ b/dvc/repo/reproduce.py @@ -126,12 +126,12 @@ def reproduce( # noqa: C901, PLR0912 ) ) - if kwargs.get("pull", False): + if kwargs.get("pull", False) and kwargs.get("run_cache", True): logger.debug("Pulling run cache") try: self.stage_cache.pull(None) - except RunCacheNotSupported: - logger.debug("Failed to pull run cache") + except RunCacheNotSupported as e: + logger.warning("Failed to pull run cache: %s", e) return _reproduce_stages(self.index.graph, list(stages), **kwargs) diff --git a/tests/func/test_repro_multistage.py b/tests/func/test_repro_multistage.py index 91ad428ca..6f98e0d8b 100644 --- a/tests/func/test_repro_multistage.py +++ b/tests/func/test_repro_multistage.py @@ -472,3 +472,16 @@ def test_repro_pulls_continue_without_run_cache(tmp_dir, dvc, mocker, local_remo remove(foo.outs[0].cache_path) assert dvc.reproduce(pull=True) + + +def test_repro_skip_pull_if_no_run_cache_is_passed(tmp_dir, dvc, mocker, local_remote): + (foo,) = tmp_dir.dvc_gen("foo", "foo") + + dvc.push() + spy_pull = mocker.spy(dvc.stage_cache, "pull") + dvc.stage.add(name="copy-foo", cmd="cp foo bar", deps=["foo"], outs=["bar"]) + remove("foo") + remove(foo.outs[0].cache_path) + + assert dvc.reproduce(pull=True, run_cache=False) + assert not spy_pull.called