Merge branch 'master' into relax_urllib_dependency

CHANGELOG.md

@@ -5,6 +5,12 @@
 ### Changed
 
  - relaxed dependency requirement for `urllib3` to >=2.0.2 to prevent ohsome-py from becoming a 'diamond-dependency'
+ - improved and sped up testing (first steps towards [#139](https://github.com/GIScience/ohsome-py/issues/139))
+ - move metadata property from singleton to `chached_property`
+
+### Fixed
+
+ - removed time-dependency of unit tests that would cause them to fail at any time after the cassettes were recorded
 
 ## 0.3.0
 

ohsome/clients.py

@@ -4,6 +4,7 @@
 """OhsomeClient classes to build and handle requests to ohsome API"""
 import datetime as dt
 import json
+from functools import cached_property
 from pathlib import Path
 from typing import Union, Optional, List
 from urllib.parse import urljoin
@@ -129,8 +130,7 @@ def __init__(
             base_api_url, log, log_dir, cache, user_agent, retry
         )
         self._parameters = None
-        self._metadata = None
-        self._metadata_url = self.base_api_url + "metadata"
+        self._metadata_url = f"{self.base_api_url}metadata"
 
     @property
     def base_api_url(self):
@@ -164,13 +164,8 @@ def api_version(self):
         """
         return self.metadata["apiVersion"]
 
-    @property
+    @cached_property
     def metadata(self):
-        if self._metadata is None:
-            self._query_metadata()
-        return self._metadata
-
-    def _query_metadata(self):
         """
         Send ohsome GET request
         :return:
@@ -193,7 +188,7 @@ def _query_metadata(self):
                 error_code=e.response.status_code,
             )
         else:
-            self._metadata = response.json()
+            return response.json()
 
 
 class _OhsomePostClient(_OhsomeBaseClient):
@@ -223,7 +218,6 @@ def __init__(
             base_api_url, log, log_dir, cache, user_agent, retry
         )
         self._parameters = None
-        self._metadata = None
         self._url = None
 
     def post(