cli: remove dvc run (#9508)

Note that `Repo.run()` API still exists, which will be removed in
successive PRs. A lot of tests depend on it that it'll take time
before removing it.

Author: skshetry

dvc/cli/parser.py

@@ -41,7 +41,6 @@
     remove,
     repro,
     root,
-    run,
     stage,
     unprotect,
     update,
@@ -62,7 +61,6 @@
     remove,
     move,
     unprotect,
-    run,
     repro,
     data_sync,
     gc,

dvc/commands/run.py

@@ -362,10 +362,6 @@ def test_should_update_state_entry_for_file_after_add(mocker, dvc, tmp_dir):
     assert ret == 0
     assert file_md5_counter.mock.call_count == 1
 
-    ret = main(["run", "--single-stage", "-d", "foo", "echo foo"])
-    assert ret == 0
-    assert file_md5_counter.mock.call_count == 1
-
     os.rename("foo", "foo.back")
     ret = main(["checkout"])
     assert ret == 0
@@ -392,19 +388,14 @@ def test_should_update_state_entry_for_directory_after_add(mocker, dvc, tmp_dir)
     assert ret == 0
     assert file_md5_counter.mock.call_count == 5
 
-    ls = "dir" if os.name == "nt" else "ls"
-    ret = main(["run", "--single-stage", "-d", "data", "{} {}".format(ls, "data")])
-    assert ret == 0
-    assert file_md5_counter.mock.call_count == 7
-
     os.rename("data", "data.back")
     ret = main(["checkout"])
     assert ret == 0
-    assert file_md5_counter.mock.call_count == 7
+    assert file_md5_counter.mock.call_count == 5
 
     ret = main(["status"])
     assert ret == 0
-    assert file_md5_counter.mock.call_count == 9
+    assert file_md5_counter.mock.call_count == 6
 
 
 def test_add_commit(tmp_dir, dvc):

tests/func/test_add.py

@@ -11,7 +11,6 @@
 from dvc.commands.init import CmdInit
 from dvc.commands.remove import CmdRemove
 from dvc.commands.repro import CmdRepro
-from dvc.commands.run import CmdRun
 from dvc.commands.status import CmdDataStatus
 from dvc.exceptions import NotDvcRepoError
 
@@ -21,54 +20,6 @@ def test_argparse(dvc):
     assert isinstance(args.func(args), CmdInit)
 
 
-def test_run(dvc):
-    dep1 = "dep1"
-    dep2 = "dep2"
-
-    out1 = "out1"
-    out2 = "out2"
-
-    out_no_cache1 = "out_no_cache1"
-    out_no_cache2 = "out_no_cache2"
-
-    fname = "dvc.dvc"
-    cmd = "cmd"
-    arg1 = "arg1"
-    arg2 = "arg2"
-
-    args = parse_args(
-        [
-            "run",
-            "-d",
-            dep1,
-            "--deps",
-            dep2,
-            "-o",
-            out1,
-            "--outs",
-            out2,
-            "-O",
-            out_no_cache1,
-            "--outs-no-cache",
-            out_no_cache2,
-            "--file",
-            fname,
-            cmd,
-            arg1,
-            arg2,
-        ]
-    )
-    cmd_cls = args.func(args)
-    assert isinstance(cmd_cls, CmdRun)
-    assert args.deps == [dep1, dep2]
-    assert args.outs == [out1, out2]
-    assert args.outs_no_cache == [out_no_cache1, out_no_cache2]
-    assert args.file == fname
-    assert args.command == [cmd, arg1, arg2]
-
-    cmd_cls.repo.close()
-
-
 def test_pull(dvc):
     args = parse_args(["pull"])
     cmd = args.func(args)

tests/func/test_cli.py

@@ -147,8 +147,6 @@ def test_hash_recalculation(mocker, dvc, tmp_dir, local_remote):
     assert ret == 0
     ret = main(["push"])
     assert ret == 0
-    ret = main(["run", "--single-stage", "-d", "foo", "echo foo"])
-    assert ret == 0
     assert test_file_md5.mock.call_count == 1
 
 

tests/func/test_data_cloud.py

@@ -335,9 +335,10 @@ def test_repro_dry_no_exec(tmp_dir, dvc):
 
         ret = main(
             [
-                "run",
-                "--no-exec",
-                "--single-stage",
+                "stage",
+                "add",
+                "-n",
+                f"copy-{idir}-{odir}",
                 "-d",
                 idir,
                 "-o",
@@ -351,18 +352,17 @@ def test_repro_dry_no_exec(tmp_dir, dvc):
 
     ret = main(
         [
-            "run",
-            "--no-exec",
-            "--single-stage",
-            "--file",
-            DVC_FILE,
+            "stage",
+            "add",
+            "-n",
+            "ls",
             *deps,
             "ls {}".format(" ".join(dep for i, dep in enumerate(deps) if i % 2)),
         ]
     )
     assert ret == 0
 
-    ret = main(["repro", "--dry", DVC_FILE])
+    ret = main(["repro", "--dry", "ls"])
     assert ret == 0
 
 
@@ -1114,14 +1114,27 @@ def test_downstream(dvc):
     #    \ /
     #     A
     #
-    assert main(["run", "--single-stage", "-o", "A", "echo A>A"]) == 0
-    assert main(["run", "--single-stage", "-d", "A", "-o", "B", "echo B>B"]) == 0
-    assert main(["run", "--single-stage", "-d", "A", "-o", "C", "echo C>C"]) == 0
+    assert main(["stage", "add", "-n", "stage-A", "--run", "-o", "A", "echo A>A"]) == 0
+    assert (
+        main(
+            ["stage", "add", "-n", "stage-B", "--run", "-d", "A", "-o", "B", "echo B>B"]
+        )
+        == 0
+    )
+    assert (
+        main(
+            ["stage", "add", "-n", "stage-C", "--run", "-d", "A", "-o", "C", "echo C>C"]
+        )
+        == 0
+    )
     assert (
         main(
             [
-                "run",
-                "--single-stage",
+                "stage",
+                "add",
+                "-n",
+                "stage-D",
+                "--run",
                 "-d",
                 "B",
                 "-d",
@@ -1133,13 +1146,21 @@ def test_downstream(dvc):
         )
         == 0
     )
-    assert main(["run", "--single-stage", "-o", "G", "echo G>G"]) == 0
-    assert main(["run", "--single-stage", "-d", "G", "-o", "F", "echo F>F"]) == 0
+    assert main(["stage", "add", "-n", "stage-G", "--run", "-o", "G", "echo G>G"]) == 0
+    assert (
+        main(
+            ["stage", "add", "-n", "stage-F", "--run", "-d", "G", "-o", "F", "echo F>F"]
+        )
+        == 0
+    )
     assert (
         main(
             [
-                "run",
-                "--single-stage",
+                "stage",
+                "add",
+                "-n",
+                "stage-E",
+                "--run",
                 "-d",
                 "D",
                 "-d",
@@ -1160,22 +1181,25 @@ def test_downstream(dvc):
     #    /
     #   B
     #
-    evaluation = dvc.reproduce("B.dvc", downstream=True, force=True)
+    evaluation = dvc.reproduce("stage-B", downstream=True, force=True)
 
     assert len(evaluation) == 3
-    assert evaluation[0].relpath == "B.dvc"
-    assert evaluation[1].relpath == "D.dvc"
-    assert evaluation[2].relpath == "E.dvc"
+    assert evaluation[0].addressing == "stage-B"
+    assert evaluation[1].addressing == "stage-D"
+    assert evaluation[2].addressing == "stage-E"
 
     # B, C should be run (in any order) before D
     # See https://github.com/iterative/dvc/issues/3602
-    evaluation = dvc.reproduce("A.dvc", downstream=True, force=True)
+    evaluation = dvc.reproduce("stage-A", downstream=True, force=True)
 
     assert len(evaluation) == 5
-    assert evaluation[0].relpath == "A.dvc"
-    assert {evaluation[1].relpath, evaluation[2].relpath} == {"B.dvc", "C.dvc"}
-    assert evaluation[3].relpath == "D.dvc"
-    assert evaluation[4].relpath == "E.dvc"
+    assert evaluation[0].addressing == "stage-A"
+    assert {evaluation[1].addressing, evaluation[2].addressing} == {
+        "stage-B",
+        "stage-C",
+    }
+    assert evaluation[3].addressing == "stage-D"
+    assert evaluation[4].addressing == "stage-E"
 
 
 def test_repro_when_cmd_changes(tmp_dir, dvc, run_copy, mocker):