From 3451f89005a15d4d85b5feb9fe219fdc3b7516dd Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Tue, 8 Dec 2020 02:22:42 +0200 Subject: [PATCH] repro: remove deprecated --cwd Per https://github.com/iterative/dvc/issues/2988 --- dvc/command/experiments.py | 6 ------ dvc/command/repro.py | 13 ------------- tests/func/test_repro.py | 39 -------------------------------------- 3 files changed, 58 deletions(-) diff --git a/dvc/command/experiments.py b/dvc/command/experiments.py index b89b95c175..1860cf2611 100644 --- a/dvc/command/experiments.py +++ b/dvc/command/experiments.py @@ -1,7 +1,6 @@ import argparse import io import logging -import os from collections import OrderedDict from collections.abc import Mapping from datetime import date, datetime @@ -438,10 +437,6 @@ def run(self): class CmdExperimentsRun(CmdRepro): def run(self): - - saved_dir = os.path.realpath(os.curdir) - os.chdir(self.args.cwd) - # Dirty hack so the for loop below can at least enter once if self.args.all_pipelines: self.args.targets = [None] @@ -466,7 +461,6 @@ def run(self): ret = 1 break - os.chdir(saved_dir) return ret diff --git a/dvc/command/repro.py b/dvc/command/repro.py index 20ee20f894..5e3ef69683 100644 --- a/dvc/command/repro.py +++ b/dvc/command/repro.py @@ -1,6 +1,5 @@ import argparse import logging -import os from dvc.command import completion from dvc.command.base import CmdBase, append_doc_link @@ -14,9 +13,6 @@ class CmdRepro(CmdBase): def run(self): - saved_dir = os.path.realpath(os.curdir) - os.chdir(self.args.cwd) - # Dirty hack so the for loop below can at least enter once if self.args.all_pipelines: self.args.targets = [None] @@ -45,7 +41,6 @@ def run(self): ret = 1 break - os.chdir(saved_dir) return ret @property @@ -88,14 +83,6 @@ def add_arguments(repro_parser): help="Reproduce only single data item without recursive dependencies " "check.", ) - repro_parser.add_argument( - "-c", - "--cwd", - default=os.path.curdir, - help="Directory within your repo to reproduce from. Note: deprecated " - "by `dvc --cd `.", - metavar="", - ) repro_parser.add_argument( "-m", "--metrics", diff --git a/tests/func/test_repro.py b/tests/func/test_repro.py index 12ad2df016..0e30489484 100644 --- a/tests/func/test_repro.py +++ b/tests/func/test_repro.py @@ -781,45 +781,6 @@ def test(self): self.assertNotEqual(ret, 0) -class TestCmdReproChdir(TestDvc): - def test(self): - dname = "dir" - os.mkdir(dname) - foo = os.path.join(dname, self.FOO) - bar = os.path.join(dname, self.BAR) - code = os.path.join(dname, self.CODE) - shutil.copyfile(self.FOO, foo) - shutil.copyfile(self.CODE, code) - - ret = main( - [ - "run", - "--single-stage", - "--file", - f"{dname}/Dvcfile", - "-w", - f"{dname}", - "-d", - self.FOO, - "-o", - self.BAR, - f"python {self.CODE} {self.FOO} {self.BAR}", - ] - ) - self.assertEqual(ret, 0) - self.assertTrue(os.path.isfile(foo)) - self.assertTrue(os.path.isfile(bar)) - self.assertTrue(filecmp.cmp(foo, bar, shallow=False)) - - os.unlink(bar) - - ret = main(["repro", "-c", dname, DVC_FILE]) - self.assertEqual(ret, 0) - self.assertTrue(os.path.isfile(foo)) - self.assertTrue(os.path.isfile(bar)) - self.assertTrue(filecmp.cmp(foo, bar, shallow=False)) - - class TestReproShell(TestDvc): def test(self): if os.name == "nt":