From e3871b37d8530845d79bf35505f853def6ea87d7 Mon Sep 17 00:00:00 2001 From: rettigl Date: Wed, 29 Jan 2025 21:00:00 +0100 Subject: [PATCH] fix time-zone warning --- src/specsscan/helpers.py | 4 ++-- src/specsscan/metadata.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/specsscan/helpers.py b/src/specsscan/helpers.py index f67d580..8980d7c 100644 --- a/src/specsscan/helpers.py +++ b/src/specsscan/helpers.py @@ -423,10 +423,10 @@ def handle_meta( ts_from = dt.datetime.timestamp(datetime_list[0]) # POSIX timestamp ts_to = dt.datetime.timestamp(datetime_list[-1]) # POSIX timestamp metadata["timing"] = { - "acquisition_start": dt.datetime.utcfromtimestamp(ts_from) + "acquisition_start": dt.datetime.fromtimestamp(ts_from, dt.timezone.utc) .replace(tzinfo=dt.timezone.utc) .isoformat(), - "acquisition_stop": dt.datetime.utcfromtimestamp(ts_to) + "acquisition_stop": dt.datetime.fromtimestamp(ts_to, dt.timezone.utc) .replace(tzinfo=dt.timezone.utc) .isoformat(), "acquisition_duration": int(ts_to - ts_from), diff --git a/src/specsscan/metadata.py b/src/specsscan/metadata.py index e2c1776..fb8c56a 100644 --- a/src/specsscan/metadata.py +++ b/src/specsscan/metadata.py @@ -92,7 +92,7 @@ def fetch_epics_metadata(self, ts_from: float, ts_to: float, metadata: dict) -> Returns: dict: Updated metadata dictionary. """ - start = datetime.datetime.utcfromtimestamp(ts_from) + start = datetime.datetime.fromtimestamp(ts_from, datetime.timezone.utc).isoformat() # replace metadata names by epics channels try: @@ -315,8 +315,8 @@ def get_archiver_data( Returns: tuple[np.ndarray, np.ndarray]: The extracted time stamps and corresponding data """ - iso_from = datetime.datetime.utcfromtimestamp(ts_from).isoformat() - iso_to = datetime.datetime.utcfromtimestamp(ts_to).isoformat() + iso_from = datetime.datetime.fromtimestamp(ts_from, datetime.timezone.utc).isoformat() + iso_to = datetime.datetime.fromtimestamp(ts_to, datetime.timezone.utc).isoformat() req_str = archiver_url + archiver_channel + "&from=" + iso_from + "Z&to=" + iso_to + "Z" with urlopen(req_str) as req: data = json.load(req)