Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 3316bea

Browse files
authored
fix py3.8 breaking changes (#73)
1 parent f3ee3b4 commit 3316bea

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

cads_api_client/catalogue.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ def temporal_interval(self) -> tuple[str, str]:
3535

3636
@property
3737
def begin_datetime(self) -> datetime.datetime:
38-
return datetime.datetime.fromisoformat(self.temporal_interval[0])
38+
return datetime.datetime.fromisoformat(
39+
self.temporal_interval[0].replace("Z", "+00:00")
40+
)
3941

4042
@property
4143
def end_datetime(self) -> datetime.datetime:
42-
return datetime.datetime.fromisoformat(self.temporal_interval[1])
44+
return datetime.datetime.fromisoformat(
45+
self.temporal_interval[1].replace("Z", "+00:00")
46+
)
4347

4448
@property
4549
def id(self) -> str:

cads_api_client/processing.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,8 @@ def download(
457457
parts = urllib.parse.urlparse(url)
458458
target = parts.path.strip("/").split("/")[-1]
459459

460-
download_options = {"stream": True} | self.download_options
460+
download_options = {"stream": True}
461+
download_options.update(self.download_options)
461462
multiurl.download(
462463
url,
463464
target=target,

tests/integration_test_40_api_client.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
from __future__ import annotations
2+
13
import contextlib
24
import datetime
35
import os
46
import pathlib
5-
import warnings
67
from typing import Any
78

89
import pytest
@@ -79,13 +80,6 @@ def test_api_client_verify(
7980
api_anon_key: str,
8081
tmp_path: pathlib.Path,
8182
) -> None:
82-
secure_client = ApiClient(
83-
url=api_root_url, key=api_anon_key, verify=True, maximum_tries=0
84-
)
85-
with warnings.catch_warnings(category=InsecureRequestWarning):
86-
warnings.simplefilter("error")
87-
secure_client.retrieve("test-adaptor-dummy", target=str(tmp_path / "test.grib"))
88-
8983
insecure_client = ApiClient(
9084
url=api_root_url, key=api_anon_key, verify=False, maximum_tries=0
9185
)

tests/integration_test_50_legacy_api_client.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
import contextlib
24
import pathlib
35
import time

0 commit comments

Comments
 (0)