run: raise error when command is not specified

dvc/repo/run.py

@@ -45,6 +45,9 @@ def run(self, fname=None, no_exec=False, single_stage=False, **kwargs):
     from dvc.stage import PipelineStage, Stage, create_stage
     from dvc.dvcfile import Dvcfile, PIPELINE_FILE
 
+    if not kwargs.get("cmd"):
+        raise InvalidArgumentError("command is not specified")
+
     stage_cls = PipelineStage
     path = PIPELINE_FILE
     stage_name = kwargs.get("name")

tests/func/metrics/conftest.py

@@ -0,0 +1 @@
+from tests.func.plots import run_copy_metrics  # noqa: F401

tests/func/metrics/test_diff.py

@@ -3,11 +3,10 @@
 import yaml
 
 
-def test_metrics_diff_simple(tmp_dir, scm, dvc):
+def test_metrics_diff_simple(tmp_dir, scm, dvc, run_copy_metrics):
     def _gen(val):
-        tmp_dir.gen({"m.yaml": str(val)})
-        dvc.run(cmd="", metrics=["m.yaml"], single_stage=True)
-        dvc.scm.add(["m.yaml.dvc"])
+        tmp_dir.gen({"m_temp.yaml": str(val)})
+        run_copy_metrics("m_temp.yaml", "m.yaml", metrics=["m.yaml"])
         dvc.scm.commit(str(val))
 
     _gen(1)
@@ -19,13 +18,13 @@ def _gen(val):
     assert dvc.metrics.diff(a_rev="HEAD~2") == expected
 
 
-def test_metrics_diff_yaml(tmp_dir, scm, dvc):
+def test_metrics_diff_yaml(tmp_dir, scm, dvc, run_copy_metrics):
     def _gen(val):
         metrics = {"a": {"b": {"c": val, "d": 1, "e": str(val)}}}
-        tmp_dir.gen({"m.yaml": yaml.dump(metrics)})
-        dvc.run(cmd="", metrics=["m.yaml"], single_stage=True)
-        dvc.scm.add(["m.yaml.dvc"])
-        dvc.scm.commit(str(val))
+        tmp_dir.gen({"m_temp.yaml": yaml.dump(metrics)})
+        run_copy_metrics(
+            "m_temp.yaml", "m.yaml", metrics=["m.yaml"], commit=str(val)
+        )
 
     _gen(1)
     _gen(2)
@@ -36,13 +35,13 @@ def _gen(val):
     assert dvc.metrics.diff(a_rev="HEAD~2") == expected
 
 
-def test_metrics_diff_json(tmp_dir, scm, dvc):
+def test_metrics_diff_json(tmp_dir, scm, dvc, run_copy_metrics):
     def _gen(val):
         metrics = {"a": {"b": {"c": val, "d": 1, "e": str(val)}}}
-        tmp_dir.gen({"m.json": json.dumps(metrics)})
-        dvc.run(cmd="", metrics=["m.json"], single_stage=True)
-        dvc.scm.add(["m.json.dvc"])
-        dvc.scm.commit(str(val))
+        tmp_dir.gen({"m_temp.json": json.dumps(metrics)})
+        run_copy_metrics(
+            "m_temp.json", "m.json", metrics=["m.json"], commit=str(val)
+        )
 
     _gen(1)
     _gen(2)
@@ -52,13 +51,13 @@ def _gen(val):
     assert dvc.metrics.diff(a_rev="HEAD~2") == expected
 
 
-def test_metrics_diff_json_unchanged(tmp_dir, scm, dvc):
+def test_metrics_diff_json_unchanged(tmp_dir, scm, dvc, run_copy_metrics):
     def _gen(val):
         metrics = {"a": {"b": {"c": val, "d": 1, "e": str(val)}}}
-        tmp_dir.gen({"m.json": json.dumps(metrics)})
-        dvc.run(cmd="", metrics=["m.json"], single_stage=True)
-        dvc.scm.add(["m.json.dvc"])
-        dvc.scm.commit(str(val))
+        tmp_dir.gen({"m_temp.json": json.dumps(metrics)})
+        run_copy_metrics(
+            "m_temp.json", "m.json", metrics=["m.json"], commit=str(val)
+        )
 
     _gen(1)
     _gen(2)
@@ -67,12 +66,15 @@ def _gen(val):
     assert dvc.metrics.diff(a_rev="HEAD~2") == {}
 
 
-def test_metrics_diff_broken_json(tmp_dir, scm, dvc):
+def test_metrics_diff_broken_json(tmp_dir, scm, dvc, run_copy_metrics):
     metrics = {"a": {"b": {"c": 1, "d": 1, "e": "3"}}}
-    tmp_dir.gen({"m.json": json.dumps(metrics)})
-    dvc.run(cmd="", metrics_no_cache=["m.json"], single_stage=True)
-    dvc.scm.add(["m.json.dvc", "m.json"])
-    dvc.scm.commit("add metrics")
+    tmp_dir.gen({"m_temp.json": json.dumps(metrics)})
+    run_copy_metrics(
+        "m_temp.json",
+        "m.json",
+        metrics_no_cache=["m.json"],
+        commit="add metrics",
+    )
 
     (tmp_dir / "m.json").write_text(json.dumps(metrics) + "ma\nlformed\n")
 
@@ -89,10 +91,10 @@ def test_metrics_diff_no_metrics(tmp_dir, scm, dvc):
     assert dvc.metrics.diff(a_rev="HEAD~1") == {}
 
 
-def test_metrics_diff_new_metric(tmp_dir, scm, dvc):
+def test_metrics_diff_new_metric(tmp_dir, scm, dvc, run_copy_metrics):
     metrics = {"a": {"b": {"c": 1, "d": 1, "e": "3"}}}
-    tmp_dir.gen({"m.json": json.dumps(metrics)})
-    dvc.run(cmd="", metrics_no_cache=["m.json"], single_stage=True)
+    tmp_dir.gen({"m_temp.json": json.dumps(metrics)})
+    run_copy_metrics("m_temp.json", "m.json", metrics_no_cache=["m.json"])
 
     assert dvc.metrics.diff() == {
         "m.json": {
@@ -102,12 +104,15 @@ def test_metrics_diff_new_metric(tmp_dir, scm, dvc):
     }
 
 
-def test_metrics_diff_deleted_metric(tmp_dir, scm, dvc):
+def test_metrics_diff_deleted_metric(tmp_dir, scm, dvc, run_copy_metrics):
     metrics = {"a": {"b": {"c": 1, "d": 1, "e": "3"}}}
-    tmp_dir.gen({"m.json": json.dumps(metrics)})
-    dvc.run(cmd="", metrics_no_cache=["m.json"], single_stage=True)
-    dvc.scm.add(["m.json.dvc", "m.json"])
-    dvc.scm.commit("add metrics")
+    tmp_dir.gen({"m_temp.json": json.dumps(metrics)})
+    run_copy_metrics(
+        "m_temp.json",
+        "m.json",
+        metrics_no_cache=["m.json"],
+        commit="add metrics",
+    )
 
     (tmp_dir / "m.json").unlink()
 
@@ -119,11 +124,14 @@ def test_metrics_diff_deleted_metric(tmp_dir, scm, dvc):
     }
 
 
-def test_metrics_diff_with_unchanged(tmp_dir, scm, dvc):
-    tmp_dir.gen("metrics.yaml", "foo: 1\nxyz: 10")
-    dvc.run(metrics_no_cache=["metrics.yaml"], single_stage=True)
-    scm.add(["metrics.yaml", "metrics.yaml.dvc"])
-    scm.commit("1")
+def test_metrics_diff_with_unchanged(tmp_dir, scm, dvc, run_copy_metrics):
+    tmp_dir.gen("metrics_temp.yaml", "foo: 1\nxyz: 10")
+    run_copy_metrics(
+        "metrics_temp.yaml",
+        "metrics.yaml",
+        metrics_no_cache=["metrics.yaml"],
+        commit="1",
+    )
 
     tmp_dir.scm_gen("metrics.yaml", "foo: 2\nxyz: 10", commit="2")
     tmp_dir.scm_gen("metrics.yaml", "foo: 3\nxyz: 10", commit="3")

tests/func/metrics/test_show.py

@@ -8,36 +8,44 @@ def test_show_empty(dvc):
         dvc.metrics.show()
 
 
-def test_show_simple(tmp_dir, dvc):
-    tmp_dir.gen("metrics.yaml", "1.1")
-    dvc.run(metrics=["metrics.yaml"], single_stage=True)
+def test_show_simple(tmp_dir, dvc, run_copy_metrics):
+    tmp_dir.gen("metrics_t.yaml", "1.1")
+    run_copy_metrics(
+        "metrics_t.yaml", "metrics.yaml", metrics=["metrics.yaml"],
+    )
     assert dvc.metrics.show() == {"": {"metrics.yaml": 1.1}}
 
 
-def test_show(tmp_dir, dvc):
-    tmp_dir.gen("metrics.yaml", "foo: 1.1")
-    dvc.run(metrics=["metrics.yaml"], single_stage=True)
+def test_show(tmp_dir, dvc, run_copy_metrics):
+    tmp_dir.gen("metrics_t.yaml", "foo: 1.1")
+    run_copy_metrics(
+        "metrics_t.yaml", "metrics.yaml", metrics=["metrics.yaml"],
+    )
     assert dvc.metrics.show() == {"": {"metrics.yaml": {"foo": 1.1}}}
 
 
-def test_show_multiple(tmp_dir, dvc):
-    tmp_dir.gen("foo", "foo: 1\n")
-    tmp_dir.gen("baz", "baz: 2\n")
-    dvc.run(fname="foo.dvc", metrics=["foo"], single_stage=True)
-    dvc.run(fname="baz.dvc", metrics=["baz"], single_stage=True)
+def test_show_multiple(tmp_dir, dvc, run_copy_metrics):
+    tmp_dir.gen("foo_temp", "foo: 1\n")
+    tmp_dir.gen("baz_temp", "baz: 2\n")
+    run_copy_metrics("foo_temp", "foo", fname="foo.dvc", metrics=["foo"])
+    run_copy_metrics("baz_temp", "baz", fname="baz.dvc", metrics=["baz"])
     assert dvc.metrics.show() == {"": {"foo": {"foo": 1}, "baz": {"baz": 2}}}
 
 
-def test_show_invalid_metric(tmp_dir, dvc):
-    tmp_dir.gen("metrics.yaml", "foo:\n- bar\n- baz\nxyz: string")
-    dvc.run(metrics=["metrics.yaml"], single_stage=True)
+def test_show_invalid_metric(tmp_dir, dvc, run_copy_metrics):
+    tmp_dir.gen("metrics_temp.yaml", "foo:\n- bar\n- baz\nxyz: string")
+    run_copy_metrics(
+        "metrics_temp.yaml", "metrics.yaml", metrics=["metrics.yaml"]
+    )
     with pytest.raises(NoMetricsError):
         dvc.metrics.show()
 
 
-def test_show_branch(tmp_dir, scm, dvc):
-    tmp_dir.gen("metrics.yaml", "foo: 1")
-    dvc.run(metrics_no_cache=["metrics.yaml"], single_stage=True)
+def test_show_branch(tmp_dir, scm, dvc, run_copy_metrics):
+    tmp_dir.gen("metrics_temp.yaml", "foo: 1")
+    run_copy_metrics(
+        "metrics_temp.yaml", "metrics.yaml", metrics_no_cache=["metrics.yaml"]
+    )
     scm.add(["metrics.yaml", "metrics.yaml.dvc"])
     scm.commit("init")
 

tests/func/params/test_diff.py

@@ -4,15 +4,15 @@ def test_diff_no_params(tmp_dir, scm, dvc):
 
 def test_diff_no_changes(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("bar")
     assert dvc.params.diff() == {}
 
 
 def test_diff(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("bar")
 
@@ -26,7 +26,7 @@ def test_diff(tmp_dir, scm, dvc):
 
 def test_diff_new(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
 
     assert dvc.params.diff() == {
         "params.yaml": {"foo": {"old": None, "new": "bar"}}
@@ -35,7 +35,7 @@ def test_diff_new(tmp_dir, scm, dvc):
 
 def test_diff_deleted(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("bar")
 
@@ -48,7 +48,7 @@ def test_diff_deleted(tmp_dir, scm, dvc):
 
 def test_diff_deleted_config(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("bar")
 
@@ -61,7 +61,7 @@ def test_diff_deleted_config(tmp_dir, scm, dvc):
 
 def test_diff_list(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo:\n- bar\n- baz")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("foo")
 
@@ -76,7 +76,7 @@ def test_diff_list(tmp_dir, scm, dvc):
 
 def test_diff_dict(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo:\n  bar: baz")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("foo")
 
@@ -89,7 +89,7 @@ def test_diff_dict(tmp_dir, scm, dvc):
 
 def test_diff_with_unchanged(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar\nxyz: val")
-    dvc.run(params=["foo,xyz"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo,xyz"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("bar")
 

tests/func/params/test_show.py

@@ -10,28 +10,38 @@ def test_show_empty(dvc):
 
 def test_show(tmp_dir, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     assert dvc.params.show() == {"": {"params.yaml": {"foo": "bar"}}}
 
 
 def test_show_multiple(tmp_dir, dvc):
     tmp_dir.gen("params.yaml", "foo: bar\nbaz: qux\n")
-    dvc.run(fname="foo.dvc", params=["foo"], single_stage=True)
-    dvc.run(fname="baz.dvc", params=["baz"], single_stage=True)
+    dvc.run(
+        cmd="echo params.yaml",
+        fname="foo.dvc",
+        params=["foo"],
+        single_stage=True,
+    )
+    dvc.run(
+        cmd="echo params.yaml",
+        fname="baz.dvc",
+        params=["baz"],
+        single_stage=True,
+    )
     assert dvc.params.show() == {
         "": {"params.yaml": {"foo": "bar", "baz": "qux"}}
     }
 
 
 def test_show_list(tmp_dir, dvc):
     tmp_dir.gen("params.yaml", "foo:\n- bar\n- baz\n")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     assert dvc.params.show() == {"": {"params.yaml": {"foo": ["bar", "baz"]}}}
 
 
 def test_show_branch(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
-    dvc.run(params=["foo"], single_stage=True)
+    dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)
     scm.add(["params.yaml", "Dvcfile"])
     scm.commit("init")
 

tests/func/plots/__init__.py

@@ -0,0 +1,30 @@
+import os
+
+import pytest
+
+
+@pytest.fixture
+def run_copy_metrics(tmp_dir, run_copy):
+    def run(file1, file2, commit=None, tag=None, **kwargs):
+        stage = tmp_dir.dvc.run(
+            cmd=f"python copy.py {file1} {file2}",
+            deps=[file1],
+            single_stage=True,
+            **kwargs,
+        )
+
+        if hasattr(tmp_dir.dvc, "scm"):
+            files = [stage.path]
+            files += [
+                os.fspath(out.path_info)
+                for out in stage.outs
+                if not out.use_cache
+            ]
+            tmp_dir.dvc.scm.add(files)
+            if commit:
+                tmp_dir.dvc.scm.commit(commit)
+            if tag:
+                tmp_dir.dvc.scm.tag(tag)
+        return stage
+
+    return run

tests/func/plots/conftest.py

@@ -0,0 +1 @@
+from . import run_copy_metrics  # noqa: F401