use renamed typepigeon functions

Author: zacharyburnett

pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "requests",
     "searvey >=0.2.0,<1.0",
     "shapely >=1.8",
-    "typepigeon >=1.0.5, <2",
+    "typepigeon >=2.0.1",
     "xarray",
 ]
 dynamic = ["version"]

stormevents/nhc/atcf.py

@@ -159,10 +159,10 @@ def atcf_files(
         )
 
     if not isinstance(file_deck, ATCF_FileDeck):
-        file_deck = typepigeon.convert_value(file_deck, ATCF_FileDeck)
+        file_deck = typepigeon.to_type(file_deck, ATCF_FileDeck)
 
     if not isinstance(mode, ATCF_Mode):
-        mode = typepigeon.convert_value(mode, ATCF_Mode)
+        mode = typepigeon.to_type(mode, ATCF_Mode)
 
     if mode == ATCF_Mode.HISTORICAL and year is None or isinstance(year, Iterable):
         if year is None:
@@ -275,15 +275,15 @@ def atcf_url(
 
     if not isinstance(file_deck, ATCF_FileDeck):
         try:
-            file_deck = typepigeon.convert_value(file_deck, ATCF_FileDeck)
+            file_deck = typepigeon.to_type(file_deck, ATCF_FileDeck)
         except ValueError:
             file_deck = None
     if file_deck is None:
         file_deck = ATCF_FileDeck.ADVISORY
 
     if not isinstance(mode, ATCF_Mode):
         try:
-            mode = typepigeon.convert_value(mode, ATCF_Mode)
+            mode = typepigeon.to_type(mode, ATCF_Mode)
         except ValueError:
             mode = None
 
@@ -328,9 +328,7 @@ def read_atcf(
     """
 
     if advisories is not None:
-        advisories = [
-            typepigeon.convert_value(advisory, str) for advisory in advisories
-        ]
+        advisories = [typepigeon.to_type(advisory, str) for advisory in advisories]
 
     if isinstance(atcf, (str, PathLike, Path)):
         atcf = open(atcf)

stormevents/nhc/track.py

@@ -368,7 +368,7 @@ def file_deck(self) -> ATCF_FileDeck:
     def file_deck(self, file_deck: ATCF_FileDeck):
         if file_deck is None and self.filename is None:
             if self.advisories is not None or len(self.advisories) > 0:
-                if ATCF_Advisory.BEST in typepigeon.convert_value(
+                if ATCF_Advisory.BEST in typepigeon.to_type(
                     self.advisories, [ATCF_Advisory]
                 ):
                     file_deck = ATCF_FileDeck.BEST
@@ -377,7 +377,7 @@ def file_deck(self, file_deck: ATCF_FileDeck):
             else:
                 file_deck = ATCF_FileDeck.BEST
         elif not isinstance(file_deck, ATCF_FileDeck):
-            file_deck = typepigeon.convert_value(file_deck, ATCF_FileDeck)
+            file_deck = typepigeon.to_type(file_deck, ATCF_FileDeck)
         self.__file_deck = file_deck
 
     @property
@@ -397,7 +397,7 @@ def advisories(self, advisories: List[ATCF_Advisory]):
         if advisories is None:
             advisories = self.__valid_advisories
         else:
-            advisories = typepigeon.convert_value(advisories, [str])
+            advisories = typepigeon.to_type(advisories, [str])
             advisories = [advisory.upper() for advisory in advisories]
         self.__advisories = advisories
 

stormevents/usgs/events.py

@@ -100,15 +100,15 @@ def usgs_flood_events(
     ]
 
     if event_type is not None:
-        event_type = typepigeon.convert_value(event_type, [str])
+        event_type = typepigeon.to_type(event_type, [str])
         events = events[events["event_type"].isin(event_type)]
 
     if event_status is not None:
-        event_status = typepigeon.convert_value(event_status, [str])
+        event_status = typepigeon.to_type(event_status, [str])
         events = events[events["event_status"].isin(event_status)]
 
     if year is not None:
-        year = typepigeon.convert_value(year, [int])
+        year = typepigeon.to_type(year, [int])
         events = events[events["year"].isin(year)]
 
     return events
@@ -324,11 +324,11 @@ def description(self) -> str:
 
     @property
     def event_type(self) -> EventType:
-        return typepigeon.convert_value(self.__metadata["event_type"], EventType)
+        return typepigeon.to_type(self.__metadata["event_type"], EventType)
 
     @property
     def event_status(self) -> EventStatus:
-        return typepigeon.convert_value(self.__metadata["event_status"], EventStatus)
+        return typepigeon.to_type(self.__metadata["event_status"], EventStatus)
 
     @property
     def coordinator(self) -> str:
@@ -348,11 +348,11 @@ def last_updated_by(self) -> str:
 
     @property
     def start_date(self) -> datetime:
-        return typepigeon.convert_value(self.__metadata["start_date"], datetime)
+        return typepigeon.to_type(self.__metadata["start_date"], datetime)
 
     @property
     def end_date(self) -> datetime:
-        return typepigeon.convert_value(self.__metadata["end_date"], datetime)
+        return typepigeon.to_type(self.__metadata["end_date"], datetime)
 
     @property
     def files(self) -> DataFrame:

stormevents/usgs/highwatermarks.py

@@ -135,15 +135,15 @@ def us_states(self) -> List[str]:
 
     @us_states.setter
     def us_states(self, us_states: List[str]):
-        self.__us_states = typepigeon.convert_value(us_states, [str])
+        self.__us_states = typepigeon.to_type(us_states, [str])
 
     @property
     def us_counties(self) -> List[str]:
         return self.__us_counties
 
     @us_counties.setter
     def us_counties(self, us_counties: List[str]):
-        self.__us_counties = typepigeon.convert_value(us_counties, [str])
+        self.__us_counties = typepigeon.to_type(us_counties, [str])
 
     @property
     def hwm_type(self) -> List[HighWaterMarkType]:
@@ -152,7 +152,7 @@ def hwm_type(self) -> List[HighWaterMarkType]:
     @hwm_type.setter
     def hwm_type(self, hwm_type: HighWaterMarkType):
         if hwm_type is not None:
-            self.__hwm_type = typepigeon.convert_value(hwm_type, [HighWaterMarkType])
+            self.__hwm_type = typepigeon.to_type(hwm_type, [HighWaterMarkType])
         else:
             self.__hwm_type = None
 
@@ -163,7 +163,7 @@ def quality(self) -> List[HighWaterMarkQuality]:
     @quality.setter
     def quality(self, quality: HighWaterMarkQuality):
         if quality is not None:
-            self.__quality = typepigeon.convert_value(quality, [HighWaterMarkQuality])
+            self.__quality = typepigeon.to_type(quality, [HighWaterMarkQuality])
         else:
             self.__quality = None
 
@@ -174,7 +174,7 @@ def environment(self) -> List[HighWaterMarkEnvironment]:
     @environment.setter
     def environment(self, environment: HighWaterMarkEnvironment):
         if environment is not None:
-            self.__environment = typepigeon.convert_value(
+            self.__environment = typepigeon.to_type(
                 environment, [HighWaterMarkEnvironment]
             )
         else:
@@ -204,7 +204,7 @@ def query(self) -> Dict[str, Any]:
                         entry.value if isinstance(entry, Enum) else entry
                         for entry in value
                     ]
-                    value = typepigeon.convert_value(value, [str])
+                    value = typepigeon.to_type(value, [str])
 
                     if len(value) > 0:
                         value = ",".join(value)

stormevents/utilities.py

@@ -27,9 +27,9 @@ def subset_time_interval(
         raise ValueError(f'cannot parse time interval "{start} - {end}"')
 
     if not isinstance(start, datetime):
-        start = typepigeon.convert_value(start, datetime)
+        start = typepigeon.to_type(start, datetime)
     if not isinstance(end, datetime):
-        end = typepigeon.convert_value(end, datetime)
+        end = typepigeon.to_type(end, datetime)
 
     if start > end:
         raise ValueError(f'given start time ("{start}") ' f'exceeds end time ("{end}")')
@@ -85,21 +85,21 @@ def relative_to_time_interval(
         )
 
     if not isinstance(start, datetime):
-        start = typepigeon.convert_value(start, datetime)
+        start = typepigeon.to_type(start, datetime)
     if not isinstance(end, datetime):
-        end = typepigeon.convert_value(end, datetime)
+        end = typepigeon.to_type(end, datetime)
 
     if start > end:
         raise ValueError(f'given start time ("{start}") ' f'exceeds end time ("{end}")')
 
     if isinstance(relative, timedelta) or isinstance(relative, Number):
-        relative = typepigeon.convert_value(relative, timedelta)
+        relative = typepigeon.to_type(relative, timedelta)
         if relative >= timedelta(0):
             relative = start + relative
         else:
             relative = end + relative
     elif not isinstance(relative, datetime):
-        relative = typepigeon.convert_value(relative, datetime)
+        relative = typepigeon.to_type(relative, datetime)
 
     if start <= relative <= end:
         return relative