implements workaround for missing cert files

Author: xenatisch

requirements.txt

@@ -1 +1,3 @@
+setuptools~=49.2.0
 requests==2.24.0
+certifi==2020.6.20

uk_covid19/__init__.py

@@ -33,7 +33,7 @@
 __copyright__ = "Copyright (c) 2020, Public Health England"
 __description__ = "SDK for the COVID-19 API (Coronavirus Dashboard in the UK)"
 __license__ = "MIT"
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 __url__ = "https://coronavirus.data.gov.uk/"
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

uk_covid19/api_interface.py

@@ -11,9 +11,10 @@
 
 # 3rd party:
 from requests import request, Response
+import certifi
 
 # Internal:
-from .utils import save_data
+from uk_covid19.utils import save_data
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -32,7 +33,6 @@ class Cov19API:
     ------------
     Interface to access the API service for COVID-19 data in the United Kingdom.
     """
-
     endpoint = "https://api.coronavirus.data.gov.uk/v1/data"
     _valid_formats = [
         "csv",
@@ -163,7 +163,8 @@ def head(self):
         """
         api_params = self.api_params
 
-        with request("HEAD", self.endpoint, params=api_params) as response:
+        with request("HEAD", self.endpoint, params=api_params,
+                     verify=certifi.where()) as response:
             response.raise_for_status()
             return response.headers
 
@@ -189,7 +190,7 @@ def options():
           ...
         }
         """
-        with request("OPTIONS", Cov19API.endpoint) as response:
+        with request("OPTIONS", Cov19API.endpoint, verify=certifi.where()) as response:
             response.raise_for_status()
             return response.json()
 
@@ -220,21 +221,22 @@ def _get(self, format_as: str) -> Iterator[Response]:
         })
 
         while True:
-            response = request("GET", self.endpoint, params=api_params)
-
-            if response.status_code >= HTTPStatus.BAD_REQUEST:
-                raise RuntimeError(f'Request failed: {response.text}')
-            elif response.status_code == HTTPStatus.NO_CONTENT:
-                self.total_pages = api_params["page"] - 1
-                break
+            with request("GET", self.endpoint, params=api_params,
+                         verify=certifi.where()) as response:
+                if response.status_code >= HTTPStatus.BAD_REQUEST:
+                    raise RuntimeError(f'Request failed: {response.text}')
+                if response.status_code == HTTPStatus.NO_CONTENT:
+                    self.total_pages = api_params["page"] - 1
+                    break
 
-            self._last_update = response.headers["Last-Modified"]
+                self._last_update = response.headers["Last-Modified"]
 
-            yield response
+                yield response
 
             api_params["page"] += 1
 
-    def get_json(self, save_as: Union[str, None] = None, as_string: bool = False) -> Union[dict, str]:
+    def get_json(self, save_as: Union[str, None] = None,
+                 as_string: bool = False) -> Union[dict, str]:
         """
         Provides full data (all pages) in JSON.
 
@@ -446,7 +448,7 @@ def get_csv(self, save_as=None) -> str:
         return resp
 
     def __str__(self):
-        resp = "COVID-19 API\nCurrent parameters: \n"
+        resp = "COVID-19 in the UK - API Service\nCurrent parameters: \n"
         return resp + dumps(self.api_params, indent=4)
 
     __repr__ = __str__