Skip to content

Commit f70440e

Browse files
committed
rimport: Default staging root is now a module-level variable.
1 parent 0aad27c commit f70440e

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

rimport

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ import sys
1616
from pathlib import Path
1717
from typing import Iterable, List
1818

19+
DEFAULT_STAGING_ROOT = Path(
20+
"/glade/campaign/collections/gdex/data/d651077/cesmdata/inputdata"
21+
)
22+
1923

2024
def build_parser() -> argparse.ArgumentParser:
2125
parser = argparse.ArgumentParser(
@@ -155,8 +159,7 @@ def get_staging_root() -> Path:
155159
env = os.getenv("RIMPORT_STAGING")
156160
if env:
157161
return Path(env).expanduser().resolve()
158-
# TODO: This should be a module-level variable.
159-
return Path("/glade/campaign/collections/gdex/data/d651077/cesmdata/inputdata")
162+
return DEFAULT_STAGING_ROOT
160163

161164

162165
def main(argv: List[str] | None = None) -> int:

tests/rimport/test_get_staging_root.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ def test_returns_default_when_env_not_set(self):
5555

5656
result = rimport.get_staging_root()
5757

58-
expected = Path(
59-
"/glade/campaign/collections/gdex/data/d651077/cesmdata/inputdata"
60-
)
61-
assert result == expected
58+
assert result == rimport.DEFAULT_STAGING_ROOT
6259

6360
def test_returns_env_value_when_set(self, tmp_path):
6461
"""Test that RIMPORT_STAGING environment variable is used when set."""
@@ -108,8 +105,5 @@ def test_env_value_overrides_default(self, tmp_path):
108105
result = rimport.get_staging_root()
109106

110107
# Should NOT be the default
111-
default = Path(
112-
"/glade/campaign/collections/gdex/data/d651077/cesmdata/inputdata"
113-
)
114-
assert result != default
108+
assert result != rimport.DEFAULT_STAGING_ROOT
115109
assert result == custom_staging.resolve()

0 commit comments

Comments
 (0)