Cleanup

Author: cthoyt

src/bioversions/charts.py

@@ -1,5 +1,7 @@
 """Generation of charts summarizing bioversions."""
 
+from __future__ import annotations
+
 import os
 from collections import Counter
 

src/bioversions/resources/__init__.py

@@ -1,5 +1,7 @@
 """Resources."""
 
+from __future__ import annotations
+
 import datetime
 from pathlib import Path
 from typing import Any

src/bioversions/resources/update.py

@@ -1,5 +1,7 @@
 """Update the web page."""
 
+from __future__ import annotations
+
 import datetime
 import getpass
 import sys

src/bioversions/sources/slm.py

@@ -21,11 +21,11 @@ class SwissLipidGetter(Getter):
     name = "SwissLipids"
     version_type = VersionType.date
 
-    def get(self) -> str:
+    def get(self) -> datetime.date:
         """Get the latest SwissLipids version number."""
         res = requests.get(URL, timeout=15).json()
         record = next(record for record in res if record["file"] == "lipids.tsv")
-        return datetime.date.strptime(record["date"], "%B %d %Y").isoformat()
+        return datetime.date.strptime(record["date"], "%B %d %Y")
 
 
 if __name__ == "__main__":

src/bioversions/sources/zfin.py

@@ -18,12 +18,12 @@ class ZfinGetter(Getter):
     name = "Zebrafish Information Network"
     version_type = VersionType.date
 
-    def get(self) -> str:
+    def get(self) -> datetime.date:
         """Get the latest ZFIN version number."""
         soup = get_soup(URL)
         header_text = find_text(soup, "h2")
         version = header_text[len("ZFIN Data Reports from: ") :].strip()
-        return datetime.date.strptime(version, "%d %b %Y").isoformat()
+        return datetime.date.strptime(version, "%d %b %Y")
 
 
 if __name__ == "__main__":

src/bioversions/utils.py

@@ -1,13 +1,15 @@
 """Utilities and implementation for bioversions."""
 
+from __future__ import annotations
+
 import datetime
 import enum
 import gzip
 import io
 import os
 from collections.abc import Generator, Iterable, Mapping
 from contextlib import contextmanager
-from typing import Any, ClassVar, NotRequired, TextIO, TypedDict, cast
+from typing import Any, ClassVar, TextIO, TypedDict, cast
 
 import bioregistry
 import pydantic
@@ -17,6 +19,7 @@
 from bs4 import Tag
 from cachier import cachier
 from pystow.utils import get_soup
+from typing_extensions import NotRequired
 
 __all__ = [
     "DailyGetter",
@@ -121,14 +124,14 @@ def find_text(element: Tag, *args: Any, **kwargs: Any) -> str:
 class MetaGetter(type):
     """A metatype to expose two class properties."""
 
-    _cache: ClassVar[str | dict[str, str] | datetime.datetime | datetime.date | None] = None
+    _cache: ClassVar[str | ReleaseDict | datetime.datetime | datetime.date | None] = None
 
     date_fmt: str | None
     date_version_fmt: str | None
     homepage_fmt: str | None
 
     @property
-    def _cache_prop(cls) -> str | dict[str, str] | datetime.datetime | datetime.date:
+    def _cache_prop(cls) -> str | ReleaseDict | datetime.datetime | datetime.date:
         if cls._cache is None:
             cls._cache = cls().get()  # type:ignore
         return cls._cache
@@ -248,7 +251,7 @@ class Getter(metaclass=MetaGetter):
     #: Prefixes this getter works for
     collection: ClassVar[list[str] | None] = None
 
-    def get(self) -> str | ReleaseDict | datetime.datetime:
+    def get(self) -> str | ReleaseDict | datetime.datetime | datetime.date:
         """Get the latest of this database."""
         raise NotImplementedError