From 69667dedc84f466d51683da4114a2e9e2981ae04 Mon Sep 17 00:00:00 2001 From: Liz Gehret <54517601+lizgehret@users.noreply.github.com> Date: Wed, 4 Oct 2023 07:02:55 -0700 Subject: [PATCH] Revert "BUG: missing changes to md_out_dir param name change (#312)" This reverts commit c49e76109b8df291573441b8f8d4b4a10b3a58c8. --- q2cli/builtin/tools.py | 4 ++-- q2cli/tests/test_core.py | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/q2cli/builtin/tools.py b/q2cli/builtin/tools.py index 7d04187c..908406c1 100644 --- a/q2cli/builtin/tools.py +++ b/q2cli/builtin/tools.py @@ -997,7 +997,7 @@ def provenance_replay( suppress_header: bool = False, verbose: bool = True, dump_recorded_metadata: bool = True, - metadata_out_dir: str = '' + metadata_out_fp: str = '' ): """ Replay provenance from a QIIME 2 Artifact filepath to a written executable @@ -1026,7 +1026,7 @@ def provenance_replay( suppress_header=suppress_header, verbose=verbose, dump_recorded_metadata=dump_recorded_metadata, - md_out_dir=metadata_out_dir + md_out_fp=metadata_out_fp ) filename = os.path.realpath(out_fp) click.echo(f'{usage_driver} replay script written to {filename}') diff --git a/q2cli/tests/test_core.py b/q2cli/tests/test_core.py index 1d0f66c5..d46765c2 100644 --- a/q2cli/tests/test_core.py +++ b/q2cli/tests/test_core.py @@ -260,8 +260,7 @@ def test_dump_recorded_md_file_to_custom_dir(self): with tempfile.TemporaryDirectory() as tempdir: cfg = ReplayConfig(use=ReplayCLIUsage(), - pm=self.pm, - md_out_dir=(tempdir + '/' + out_dir)) + pm=self.pm, md_out_fp=(tempdir + '/' + out_dir)) dump_recorded_md_file(cfg, provnode, action_name, md_id, fn) out_path = pathlib.Path(tempdir) / out_dir / action_name / fn @@ -351,8 +350,7 @@ def test_replay_optional_param_is_none(self): dag = self.das.int_seq_optional_input.dag with tempfile.TemporaryDirectory() as tempdir: out_path = pathlib.Path(tempdir) / 'ns_coll.txt' - replay_provenance(ReplayCLIUsage, dag, out_path, - md_out_dir=tempdir) + replay_provenance(ReplayCLIUsage, dag, out_path, md_out_fp=tempdir) with open(out_path, 'r') as fp: rendered = fp.read() @@ -379,8 +377,7 @@ def test_replay_from_provdag_ns_collision(self): exp = ['concatenated-ints-0', 'concatenated-ints-1'] with tempfile.TemporaryDirectory() as tempdir: out_path = pathlib.Path(tempdir) / 'ns_coll.txt' - replay_provenance(ReplayCLIUsage, dag, out_path, - md_out_dir=tempdir) + replay_provenance(ReplayCLIUsage, dag, out_path, md_out_fp=tempdir) with open(out_path, 'r') as fp: rendered = fp.read()