Skip to content

Commit 8656bf7

Browse files
EliEli
authored andcommitted
Fixed local testing errors.
1 parent b65c400 commit 8656bf7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dms_datastore/inventory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def repo_data_inventory(repo=None, *, repo_cfg=None, in_path=None, registry=None
204204
repo_cfg = coerce_repo_config(repo=repo, repo_cfg=repo_cfg)
205205
root = in_path if in_path is not None else repo_cfg["root"]
206206
registry = repo_registry(repo_cfg=repo_cfg)
207+
join_key = repo_cfg.get("key_column", "station_id")
207208

208209
allfiles = _inventory_files(root)
209210
allmeta = _parse_inventory_meta(allfiles, repo_cfg=repo_cfg)
@@ -216,7 +217,6 @@ def repo_data_inventory(repo=None, *, repo_cfg=None, in_path=None, registry=None
216217
metadf["file_pattern"] = metadf["filename"].map(
217218
lambda x: to_wildcard(x, remove_source=True)
218219
)
219-
join_key = repo_cfg.get("key_column", "station_id")
220220
if "agency" not in metadf.columns:
221221
# Reset index if key_column is both an index and a column to avoid ambiguity in merge
222222
if registry.index.name == join_key:
@@ -276,7 +276,7 @@ def repo_data_inventory(repo=None, *, repo_cfg=None, in_path=None, registry=None
276276
"eyear": "max_year",
277277
}
278278
grouped = grouped.rename(columns=rename_map)
279-
join_key = repo_cfg.get("key_column", "id")
279+
280280

281281
if join_key not in grouped.columns:
282282
if join_key == "id" and "station_id" in grouped.columns:

dms_datastore/reformat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ def test_block_size():
6868
RAW_NAMING = naming_spec(
6969
templates=["{agency}_{key@subloc}_{agency_id}_{param}_{syear}_{eyear}.csv"]
7070
)
71-
FORMATTED_NAMING = naming_spec(repo="formatted")
72-
FORMATTED_NAMING["parse"] = {"style": "template"}
71+
7372

7473

7574
def _raw_source_from_meta(meta):
@@ -496,6 +495,7 @@ def reformat(inpath, outpath, pattern):
496495
df.columns = ["value"]
497496

498497
meta_for_name = dict(hdr_meta)
498+
FORMATTED_NAMING = naming_spec(repo="formatted")
499499
newfname = os.path.join(
500500
outpath,
501501
meta_to_filename(

0 commit comments

Comments
 (0)