From abc43ebea53faa75b666e8ee91da347433d322fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?= <16805946+edgarrmondragon@users.noreply.github.com> Date: Mon, 27 May 2024 14:34:06 -0600 Subject: [PATCH] refactor: Change to return type of `utc_now` from `pendulum.DateTime` to `datetime.datetime` (#2453) --- singer_sdk/authenticators.py | 5 ++--- singer_sdk/helpers/_util.py | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/singer_sdk/authenticators.py b/singer_sdk/authenticators.py index 6d9c7303f..8c550fe31 100644 --- a/singer_sdk/authenticators.py +++ b/singer_sdk/authenticators.py @@ -3,6 +3,7 @@ from __future__ import annotations import base64 +import datetime import math import typing as t import warnings @@ -17,8 +18,6 @@ if t.TYPE_CHECKING: import logging - from pendulum import DateTime - from singer_sdk.streams.rest import RESTStream @@ -382,7 +381,7 @@ def __init__( # Initialize internal tracking attributes self.access_token: str | None = None self.refresh_token: str | None = None - self.last_refreshed: DateTime | None = None + self.last_refreshed: datetime.datetime | None = None self.expires_in: int | None = None @property diff --git a/singer_sdk/helpers/_util.py b/singer_sdk/helpers/_util.py index 0d35b14b4..5d8f53f26 100644 --- a/singer_sdk/helpers/_util.py +++ b/singer_sdk/helpers/_util.py @@ -8,6 +8,9 @@ import pendulum +if t.TYPE_CHECKING: + import datetime + def read_json_file(path: PurePath | str) -> dict[str, t.Any]: """Read json file, throwing an error if missing.""" @@ -25,6 +28,7 @@ def read_json_file(path: PurePath | str) -> dict[str, t.Any]: return t.cast(dict, json.loads(Path(path).read_text(encoding="utf-8"))) -def utc_now() -> pendulum.DateTime: +def utc_now() -> datetime.datetime: """Return current time in UTC.""" + # TODO: replace with datetime.datetime.now(tz=datetime.timezone.utc) return pendulum.now(tz="UTC")