Skip to content

Commit 3691577

Browse files
committed
rimport: Rename args.importdata to args.importdata_root.
For consistency with relink.
1 parent e659ccc commit 3691577

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

rimport

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def build_parser() -> argparse.ArgumentParser:
7272
parser.add_argument(
7373
"--inputdata",
7474
"-inputdata",
75-
dest="inputdata",
75+
dest="inputdata_root",
7676
metavar="inputdata_dir",
7777
default=DEFAULT_INPUTDATA_ROOT,
7878
help=(
@@ -384,7 +384,7 @@ def main(argv: List[str] | None = None) -> int:
384384
if not args.check and os.getenv("RIMPORT_SKIP_USER_CHECK") != "1":
385385
ensure_running_as(STAGE_OWNER, sys.argv)
386386

387-
root = Path(args.inputdata).expanduser().resolve()
387+
root = Path(args.inputdata_root).expanduser().resolve()
388388
if not root.exists():
389389
logger.error("rimport: inputdata directory does not exist: %s", root)
390390
return 2

tests/rimport/test_build_parser.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_inputdata_arguments_accepted(self, inputdata_flag):
5454
parser = rimport.build_parser()
5555
inputdata_dir = "/some/dir"
5656
args = parser.parse_args([inputdata_flag, inputdata_dir, "-f", "dummy_file.nc"])
57-
assert args.inputdata == inputdata_dir
57+
assert args.inputdata_root == inputdata_dir
5858

5959
def test_file_and_list_mutually_exclusive(self, capsys):
6060
"""Test that -file and -list cannot be used together."""
@@ -82,7 +82,7 @@ def test_inputdata_default(self):
8282
"""Test that -inputdata has correct default value."""
8383
parser = rimport.build_parser()
8484
args = parser.parse_args(["-file", "test.txt"])
85-
assert args.inputdata == rimport.DEFAULT_INPUTDATA_ROOT
85+
assert args.inputdata_root == rimport.DEFAULT_INPUTDATA_ROOT
8686

8787
def test_check_default(self):
8888
"""Test that --check has the correct default value."""
@@ -102,7 +102,7 @@ def test_inputdata_custom(self):
102102
parser = rimport.build_parser()
103103
custom_path = "/custom/path"
104104
args = parser.parse_args(["-file", "test.txt", "-inputdata", custom_path])
105-
assert args.inputdata == custom_path
105+
assert args.inputdata_root == custom_path
106106

107107
@pytest.mark.parametrize("help_flag", ["-help", "-h", "--help"])
108108
def test_help_flags_show_help(self, help_flag):
@@ -118,14 +118,14 @@ def test_file_with_inputdata(self):
118118
parser = rimport.build_parser()
119119
args = parser.parse_args(["-file", "data.nc", "-inputdata", "/my/data"])
120120
assert args.file == "data.nc"
121-
assert args.inputdata == "/my/data"
121+
assert args.inputdata_root == "/my/data"
122122

123123
def test_list_with_inputdata(self):
124124
"""Test combining -list with -inputdata."""
125125
parser = rimport.build_parser()
126126
args = parser.parse_args(["-list", "files.txt", "-inputdata", "/my/data"])
127127
assert args.filelist == "files.txt"
128-
assert args.inputdata == "/my/data"
128+
assert args.inputdata_root == "/my/data"
129129

130130
def test_quiet_default(self):
131131
"""Test that quiet defaults to False."""

0 commit comments

Comments
 (0)