Skip to content

Commit b6972d9

Browse files
nmdefriesnmdefries
committed
linting
linting linting linting formating
1 parent 38a99b7 commit b6972d9

File tree

2 files changed

+64
-53
lines changed

2 files changed

+64
-53
lines changed

‎epidatpy/_endpoints.py‎

Lines changed: 62 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ def pvt_quidel(self, auth: str, locations: StringParam, epiweeks: EpiRangeParam
872872

873873
def pub_rvdss(
874874
self,
875-
geo_type: GeoType,
875+
geo_type: StringParam,
876876
geo_values: Union[str, Sequence[str]] = "*",
877877
time_values: EpiRangeParam = "*",
878878
as_of: Union[None, str, int] = None,
@@ -891,57 +891,67 @@ def pub_rvdss(
891891
"as_of": as_of,
892892
"issues": issues,
893893
},
894-
# descriptive fields
895-
EpidataFieldInfo("geo_type", EpidataFieldType.categorical, categories=list("nation", "region", "province", "lab")),
896-
EpidataFieldInfo("geo_value", EpidataFieldInfo.text),
897-
EpidataFieldInfo("region", EpidataFieldInfo.text),
898-
EpidataFieldInfo("time_type", EpidataFieldType.categorical, categories=list("week")),
899-
EpidataFieldInfo("epiweek", EpidataFieldInfo.epiweek), # Stored as an int in YYYYWW format
900-
EpidataFieldInfo("time_value", EpidataFieldInfo.epiweek), # Stored as a date
901-
EpidataFieldInfo("issue", EpidataFieldInfo.epiweek), # Stored as a date
902-
EpidataFieldInfo("week", EpidataFieldInfo.int),
903-
EpidataFieldInfo("weekorder", EpidataFieldInfo.int),
904-
EpidataFieldInfo("year", EpidataFieldInfo.int),
905-
906-
# value fields
907-
EpidataFieldInfo("adv_pct_positive", EpidataFieldInfo.float),
908-
EpidataFieldInfo("adv_positive_tests", EpidataFieldInfo.float),
909-
EpidataFieldInfo("adv_tests", EpidataFieldInfo.float),
910-
EpidataFieldInfo("evrv_pct_positive", EpidataFieldInfo.float),
911-
EpidataFieldInfo("evrv_positive_tests", EpidataFieldInfo.float),
912-
EpidataFieldInfo("evrv_tests", EpidataFieldInfo.float),
913-
EpidataFieldInfo("flu_pct_positive", EpidataFieldInfo.float),
914-
EpidataFieldInfo("flu_positive_tests", EpidataFieldInfo.float),
915-
EpidataFieldInfo("flu_tests", EpidataFieldInfo.float),
916-
EpidataFieldInfo("flua_pct_positive", EpidataFieldInfo.float),
917-
EpidataFieldInfo("flua_positive_tests", EpidataFieldInfo.float),
918-
EpidataFieldInfo("flua_tests", EpidataFieldInfo.float),
919-
EpidataFieldInfo("fluah1n1pdm09_positive_tests", EpidataFieldInfo.float),
920-
EpidataFieldInfo("fluah3_positive_tests", EpidataFieldInfo.float),
921-
EpidataFieldInfo("fluauns_positive_tests", EpidataFieldInfo.float),
922-
EpidataFieldInfo("flub_pct_positive", EpidataFieldInfo.float),
923-
EpidataFieldInfo("flub_positive_tests", EpidataFieldInfo.float),
924-
EpidataFieldInfo("flub_tests", EpidataFieldInfo.float),
925-
EpidataFieldInfo("hcov_pct_positive", EpidataFieldInfo.float),
926-
EpidataFieldInfo("hcov_positive_tests", EpidataFieldInfo.float),
927-
EpidataFieldInfo("hcov_tests", EpidataFieldInfo.float),
928-
EpidataFieldInfo("hmpv_pct_positive", EpidataFieldInfo.float),
929-
EpidataFieldInfo("hmpv_positive_tests", EpidataFieldInfo.float),
930-
EpidataFieldInfo("hmpv_tests", EpidataFieldInfo.float),
931-
EpidataFieldInfo("hpiv1_positive_tests", EpidataFieldInfo.float),
932-
EpidataFieldInfo("hpiv2_positive_tests", EpidataFieldInfo.float),
933-
EpidataFieldInfo("hpiv3_positive_tests", EpidataFieldInfo.float),
934-
EpidataFieldInfo("hpiv4_positive_tests", EpidataFieldInfo.float),
935-
EpidataFieldInfo("hpiv_pct_positive", EpidataFieldInfo.float),
936-
EpidataFieldInfo("hpiv_positive_tests", EpidataFieldInfo.float),
937-
EpidataFieldInfo("hpiv_tests", EpidataFieldInfo.float),
938-
EpidataFieldInfo("hpivother_positive_tests", EpidataFieldInfo.float),
939-
EpidataFieldInfo("rsv_pct_positive", EpidataFieldInfo.float),
940-
EpidataFieldInfo("rsv_positive_tests", EpidataFieldInfo.float),
941-
EpidataFieldInfo("rsv_tests", EpidataFieldInfo.float),
942-
EpidataFieldInfo("sarscov2_pct_positive", EpidataFieldInfo.float),
943-
EpidataFieldInfo("sarscov2_positive_tests", EpidataFieldInfo.float),
944-
EpidataFieldInfo("sarscov2_tests", EpidataFieldInfo.float)
894+
[
895+
# descriptive fields
896+
EpidataFieldInfo(
897+
"geo_type",
898+
EpidataFieldType.categorical,
899+
categories=["nation", "region", "province", "lab"]
900+
),
901+
EpidataFieldInfo("geo_value",EpidataFieldType.text),
902+
EpidataFieldInfo("region", EpidataFieldType.text),
903+
EpidataFieldInfo(
904+
"time_type",
905+
EpidataFieldType.categorical,
906+
categories=["week"]
907+
),
908+
EpidataFieldInfo("epiweek", EpidataFieldType.epiweek), # Stored as an int in YYYYWW format
909+
EpidataFieldInfo("time_value", EpidataFieldType.epiweek), # Stored as a date
910+
EpidataFieldInfo("issue", EpidataFieldType.epiweek), # Stored as a date
911+
EpidataFieldInfo("week", EpidataFieldType.int),
912+
EpidataFieldInfo("weekorder", EpidataFieldType.int),
913+
EpidataFieldInfo("year", EpidataFieldType.int),
914+
915+
# value fields
916+
EpidataFieldInfo("adv_pct_positive", EpidataFieldType.float),
917+
EpidataFieldInfo("adv_positive_tests", EpidataFieldType.float),
918+
EpidataFieldInfo("adv_tests", EpidataFieldType.float),
919+
EpidataFieldInfo("evrv_pct_positive", EpidataFieldType.float),
920+
EpidataFieldInfo("evrv_positive_tests", EpidataFieldType.float),
921+
EpidataFieldInfo("evrv_tests", EpidataFieldType.float),
922+
EpidataFieldInfo("flu_pct_positive", EpidataFieldType.float),
923+
EpidataFieldInfo("flu_positive_tests", EpidataFieldType.float),
924+
EpidataFieldInfo("flu_tests", EpidataFieldType.float),
925+
EpidataFieldInfo("flua_pct_positive", EpidataFieldType.float),
926+
EpidataFieldInfo("flua_positive_tests", EpidataFieldType.float),
927+
EpidataFieldInfo("flua_tests", EpidataFieldType.float),
928+
EpidataFieldInfo("fluah1n1pdm09_positive_tests", EpidataFieldType.float),
929+
EpidataFieldInfo("fluah3_positive_tests", EpidataFieldType.float),
930+
EpidataFieldInfo("fluauns_positive_tests", EpidataFieldType.float),
931+
EpidataFieldInfo("flub_pct_positive", EpidataFieldType.float),
932+
EpidataFieldInfo("flub_positive_tests", EpidataFieldType.float),
933+
EpidataFieldInfo("flub_tests", EpidataFieldType.float),
934+
EpidataFieldInfo("hcov_pct_positive", EpidataFieldType.float),
935+
EpidataFieldInfo("hcov_positive_tests", EpidataFieldType.float),
936+
EpidataFieldInfo("hcov_tests", EpidataFieldType.float),
937+
EpidataFieldInfo("hmpv_pct_positive", EpidataFieldType.float),
938+
EpidataFieldInfo("hmpv_positive_tests", EpidataFieldType.float),
939+
EpidataFieldInfo("hmpv_tests", EpidataFieldType.float),
940+
EpidataFieldInfo("hpiv1_positive_tests", EpidataFieldType.float),
941+
EpidataFieldInfo("hpiv2_positive_tests", EpidataFieldType.float),
942+
EpidataFieldInfo("hpiv3_positive_tests", EpidataFieldType.float),
943+
EpidataFieldInfo("hpiv4_positive_tests", EpidataFieldType.float),
944+
EpidataFieldInfo("hpiv_pct_positive", EpidataFieldType.float),
945+
EpidataFieldInfo("hpiv_positive_tests", EpidataFieldType.float),
946+
EpidataFieldInfo("hpiv_tests", EpidataFieldType.float),
947+
EpidataFieldInfo("hpivother_positive_tests", EpidataFieldType.float),
948+
EpidataFieldInfo("rsv_pct_positive", EpidataFieldType.float),
949+
EpidataFieldInfo("rsv_positive_tests", EpidataFieldType.float),
950+
EpidataFieldInfo("rsv_tests", EpidataFieldType.float),
951+
EpidataFieldInfo("sarscov2_pct_positive", EpidataFieldType.float),
952+
EpidataFieldInfo("sarscov2_positive_tests", EpidataFieldType.float),
953+
EpidataFieldInfo("sarscov2_tests", EpidataFieldType.float),
954+
]
945955
)
946956

947957
def pvt_sensors(

‎tests/test_epidata_calls.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ def test_pvt_quidel(self) -> None:
368368
assert str(data["value"].dtype) == "Float64"
369369

370370
def test_pub_rvdss(self) -> None:
371+
# pylint: disable=too-many-statements
371372
apicall = EpiDataContext().pub_rvdss(
372373
geo_type="province",
373374
geo_values=["yu", "on"],
@@ -377,7 +378,7 @@ def test_pub_rvdss(self) -> None:
377378

378379
assert len(data) > 0
379380

380-
apicall = EpiDataContext().pub_covidcast(
381+
apicall = EpiDataContext().pub_rvdss(
381382
geo_type="region",
382383
geo_values="*",
383384
time_values=EpiRange(20200601, 20200801),

0 commit comments

Comments
 (0)