Skip to content

Commit

Permalink
Move remaining constants representing paths to NSIDC-hosted data
Browse files Browse the repository at this point in the history
...into the regression tests dir where they belong.
  • Loading branch information
trey-stafford committed Dec 21, 2023
1 parent 684dccb commit 76432f4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
9 changes: 0 additions & 9 deletions pm_icecon/constants.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
from pathlib import Path

from pm_icecon.config.models import FlagValues

DEFAULT_FLAG_VALUES = FlagValues()

# NSIDC infrastructure-specific paths:
NSIDC_NFS_SHARE_DIR = Path("/share/apps/amsr2-cdr")
# Contains regression data, ancillary data files (masks), etc.
# TODO: move ancillary files out of `cdr_testdata` dir? On the VMs, the
# ancillary nasateam files in cdr_testdata are also in the `NSIDC_NFS_SHARE_DIR`
CDR_TESTDATA_DIR = NSIDC_NFS_SHARE_DIR / "cdr_testdata"
10 changes: 10 additions & 0 deletions pm_icecon/tests/regression/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from pathlib import Path


# NSIDC infrastructure-specific paths:
NSIDC_NFS_SHARE_DIR = Path("/share/apps/amsr2-cdr")

# Contains regression data, ancillary data files (masks), etc.
# TODO: move ancillary files out of `cdr_testdata` dir? On the VMs, the
# ancillary nasateam files in cdr_testdata are also in the `NSIDC_NFS_SHARE_DIR`
CDR_TESTDATA_DIR = NSIDC_NFS_SHARE_DIR / "cdr_testdata"
2 changes: 1 addition & 1 deletion pm_icecon/tests/regression/test_bt.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from pm_icecon.config.models.bt import BootstrapParams
from pm_icecon.interpolation import spatial_interp_tbs
from pm_icecon.util import get_ps25_grid_shape
from pm_icecon.constants import (
from pm_icecon.tests.regression import (
CDR_TESTDATA_DIR,
NSIDC_NFS_SHARE_DIR,
)
Expand Down
2 changes: 1 addition & 1 deletion pm_icecon/tests/regression/test_nt.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from numpy.testing import assert_almost_equal
from pm_tb_data._types import Hemisphere

from pm_icecon.constants import CDR_TESTDATA_DIR
from pm_icecon.tests.regression import CDR_TESTDATA_DIR
from pm_icecon.interpolation import spatial_interp_tbs
from pm_icecon.nt.compute_nt_ic import goddard_nasateam
from pm_icecon.nt.params.goddard_rss import (
Expand Down

0 comments on commit 76432f4

Please sign in to comment.