Skip to content

Commit e9b080c

Browse files
committed
Nans: update to the finalized nancode names
1 parent 660b195 commit e9b080c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

integrations/acquisition/covidcast/test_csv_uploading.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test_uploading(self):
8282
# invalid, missing with an inf value
8383
with open(source_receiving_dir + '/20200419_state_test_missing1.csv', 'w') as f:
8484
f.write('geo_id,val,se,sample_size,missing_val,missing_se,missing_sample_size\n')
85-
f.write(f'fl,inf,0.3,30,{Nans.UNKNOWN},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')
85+
f.write(f'fl,inf,0.3,30,{Nans.OTHER},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')
8686

8787
# invalid, missing with an incorrect missing code
8888
with open(source_receiving_dir + '/20200419_state_test_missing2.csv', 'w') as f:
@@ -92,7 +92,7 @@ def test_uploading(self):
9292
# invalid, no missing with an incorrect missing code
9393
with open(source_receiving_dir + '/20200419_state_test_missing3.csv', 'w') as f:
9494
f.write('geo_id,val,se,sample_size,missing_val,missing_se,missing_sample_size\n')
95-
f.write(f'wa,3,0.3,30,{Nans.UNKNOWN},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')
95+
f.write(f'wa,3,0.3,30,{Nans.OTHER},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')
9696

9797
# valid wip
9898
with open(source_receiving_dir + '/20200419_state_wip_prototype.csv', 'w') as f:
@@ -221,7 +221,7 @@ def apply_lag(expected_epidata):
221221
'sample_size': 20,
222222
'direction': None,
223223
'signal': 'test_no_missing',
224-
'missing_value': Nans.UNKNOWN,
224+
'missing_value': Nans.OTHER,
225225
'missing_stderr': Nans.NOT_MISSING,
226226
'missing_sample_size': Nans.NOT_MISSING,
227227
},

integrations/server/test_covidcast.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ def test_nullable_columns(self):
622622
insert into covidcast values
623623
(0, 'src', 'sig', 'day', 'county', 20200414, '01234',
624624
123, 0.123, NULL, NULL, 456, NULL, 20200414, 0, 1, False,
625-
{Nans.NOT_MISSING}, {Nans.UNKNOWN}, {Nans.UNKNOWN})
625+
{Nans.NOT_MISSING}, {Nans.OTHER}, {Nans.OTHER})
626626
''')
627627
self.cnx.commit()
628628

@@ -651,8 +651,8 @@ def test_nullable_columns(self):
651651
'lag': 0,
652652
'signal': 'sig',
653653
'missing_value': Nans.NOT_MISSING,
654-
'missing_stderr': Nans.UNKNOWN,
655-
'missing_sample_size': Nans.UNKNOWN
654+
'missing_stderr': Nans.OTHER,
655+
'missing_sample_size': Nans.OTHER
656656
}],
657657
'message': 'success',
658658
}

src/acquisition/covidcast/csv_importer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def validate_missing_code(row, attr_quantity, attr_name):
238238
return missing_entry
239239
else:
240240
if attr_quantity is None:
241-
return Nans.UNKNOWN.value
241+
return Nans.OTHER.value
242242
return Nans.NOT_MISSING.value
243243

244244
@staticmethod

tests/acquisition/covidcast/test_csv_importer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ def make_row(
171171
(make_row(missing_val='missing_val'), 'missing_val'),
172172
(make_row(missing_se='missing_val'), 'missing_se'),
173173
(make_row(missing_sample_size='missing_val'), 'missing_sample_size'),
174-
(make_row(val='1.2', missing_val=Nans.UNKNOWN), 'missing_val'),
175-
(make_row(se='1.2', missing_se=Nans.UNKNOWN), 'missing_se'),
176-
(make_row(sample_size='1.2', missing_sample_size=Nans.UNKNOWN), 'missing_sample_size')
174+
(make_row(val='1.2', missing_val=Nans.OTHER), 'missing_val'),
175+
(make_row(se='1.2', missing_se=Nans.OTHER), 'missing_se'),
176+
(make_row(sample_size='1.2', missing_sample_size=Nans.OTHER), 'missing_sample_size')
177177
]
178178

179179
for ((geo_type, row), field) in failure_cases:
@@ -195,7 +195,7 @@ def make_row(
195195
# a nominal case with missing values
196196
geo_type, row = make_row(
197197
se='', sample_size='NA',
198-
missing_se=Nans.UNKNOWN, missing_sample_size=Nans.UNKNOWN
198+
missing_se=Nans.OTHER, missing_sample_size=Nans.OTHER
199199
)
200200
values, error = CsvImporter.extract_and_check_row(row, geo_type)
201201

0 commit comments

Comments
 (0)