apply new version of black

ecmwf/opendata/__init__.py

@@ -10,6 +10,6 @@
 
 from .client import Client
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 __all__ = ["Client"]

ecmwf/opendata/client.py

@@ -47,7 +47,6 @@
 
 
 def warning_once(*args, did_you_mean=None):
-
     if repr(args) in ONCE:
         return
 
@@ -109,21 +108,22 @@ def __init__(
         preserve_request_order=False,
         infer_stream_keyword=True,
         debug=False,
+        verify=True,
     ):
         self._url = None
         self.source = source
         self.beta = beta
         self.preserve_request_order = preserve_request_order
         self.infer_stream_keyword = infer_stream_keyword
+        self.session = requests.Session()
+        self.verify = verify
 
         if debug:
             logging.basicConfig(level=logging.DEBUG)
 
     @property
     def url(self):
-
         if self._url is None:
-
             if self.source.startswith("http://") or self.source.startswith("https://"):
                 self._url = self.source
             else:
@@ -141,12 +141,22 @@ def url(self):
 
     def retrieve(self, request=None, target=None, **kwargs):
         result = self._get_urls(request, target=target, use_index=True, **kwargs)
-        result.size = download(result.urls, target=result.target)
+        result.size = download(
+            result.urls,
+            target=result.target,
+            verify=self.verify,
+            session=self.session,
+        )
         return result
 
     def download(self, request=None, target=None, **kwargs):
         result = self._get_urls(request, target=target, use_index=False, **kwargs)
-        result.size = download(result.urls, target=result.target)
+        result.size = download(
+            result.urls,
+            target=result.target,
+            verify=self.verify,
+            session=self.session,
+        )
         return result
 
     def latest(self, request=None, **kwargs):
@@ -171,15 +181,17 @@ def latest(self, request=None, **kwargs):
                 date=date,
                 **params,
             )
-            codes = [robust(requests.head)(url).status_code for url in result.urls]
+            codes = [
+                robust(self.session.head)(url, verify=self.verify).status_code
+                for url in result.urls
+            ]
             if len(codes) > 0 and all(c == 200 for c in codes):
                 return date
             date -= delta
 
         raise ValueError("Cannot establish latest date for %r" % (result.for_urls,))
 
     def _get_urls(self, request=None, use_index=None, target=None, **kwargs):
-
         assert use_index in (True, False)
         if request is None:
             params = dict(**kwargs)
@@ -230,7 +242,6 @@ def _get_urls(self, request=None, use_index=None, target=None, **kwargs):
         )
 
     def get_parts(self, data_urls, for_index):
-
         count = len(for_index)
         result = []
         line = None
@@ -240,7 +251,7 @@ def get_parts(self, data_urls, for_index):
         for url in data_urls:
             base, _ = os.path.splitext(url)
             index_url = f"{base}.index"
-            r = robust(requests.get)(index_url)
+            r = robust(self.session.get)(index_url, verify=self.verify)
             r.raise_for_status()
 
             parts = []

ecmwf/opendata/date.py

@@ -31,7 +31,6 @@ def canonical_time(time):
 
 
 def full_date(date, time=None):
-
     if isinstance(date, datetime.date) and not isinstance(date, datetime.datetime):
         date = datetime.datetime(date.year, date.month, date.day)
 
@@ -43,7 +42,6 @@ def full_date(date, time=None):
             date = datetime.datetime(date // 10000, date % 10000 // 100, date % 100)
 
     if isinstance(date, str):
-
         try:
             return full_date(int(date), time)
         except ValueError:

ecmwf/opendata/grib.py

@@ -25,7 +25,6 @@
 
 
 def grib_index(path):
-
     index = []
     with open(path, "rb") as f:
         while True:

setup.py

@@ -41,7 +41,7 @@ def read(fname):
     url="https://github.com/ecmwf/ecmwf-opendata",
     packages=setuptools.find_namespace_packages(include=["ecmwf.*"]),
     include_package_data=True,
-    install_requires=["multiurl>=0.2.0"],
+    install_requires=["multiurl>=0.2.1"],
     zip_safe=True,
     keywords="tool",
     classifiers=[

tests/test_date.py

@@ -7,7 +7,6 @@
 
 @freeze_time("2022-01-21T13:21:34Z")
 def test_date_1():
-
     assert full_date("20010101") == datetime.datetime(2001, 1, 1)
     assert full_date(20010101) == datetime.datetime(2001, 1, 1)
     assert full_date("2001-01-01") == datetime.datetime(2001, 1, 1)

tests/test_examples.py

@@ -8,7 +8,6 @@
 
 
 def example_list():
-
     examples = []
     code = []
     python = False

tests/test_stream.py

@@ -8,7 +8,6 @@ def patch_stream(stream, time, type):
 
 
 def test_stream():
-
     assert patch_stream("oper", 0, "fc") == "oper"
     assert patch_stream("oper", 6, "fc") == "scda"
     assert patch_stream("oper", 12, "fc") == "oper"

tools/check-index.py

@@ -87,7 +87,6 @@
                     ("stream", rstream, stream),
                     ("type", rtype, type),
                 ):
-
                     if b != c:
                         print("Mismatch: %r %r %r" % (a, b, c))
                         # assert False

tools/param-units.py

@@ -45,7 +45,6 @@
 
 with open("index.txt") as f:
     for j, url in enumerate(f):
-
         url = url.rstrip()
 
         if (
@@ -67,7 +66,6 @@
             lines.append(line)
 
         for i, line in enumerate(lines):
-
             key = tuple(line.get(x) for x in ("type", "stream", "levtype", "param"))
             if key in seen:
                 continue