added http_timeout optional parameter to SingularClient + bumped version

Author: RubyFeinstein

requirements.txt

@@ -1,4 +1,4 @@
 requests==2.20.0
 pytz==2016.6.1
 retrying==1.3.3
-futures==3.2.0
+futures==3.1.1

singular_api_client/singular_client.py

@@ -22,8 +22,9 @@ class SingularClient(object):
         - https://developers.singular.net/v2.0/reference
     """
     BASE_API_URL = "https://api.singular.net/api/"
+    DEFAULT_HTTP_TIMEOUT = 60 * 5
 
-    def __init__(self, api_key):
+    def __init__(self, api_key, http_timeout=DEFAULT_HTTP_TIMEOUT):
         self.api_key = api_key
         session = requests.Session()
         retry = Retry(
@@ -35,6 +36,7 @@ def __init__(self, api_key):
         adapter = HTTPAdapter(max_retries=retry)
         session.mount('http://', adapter)
         session.mount('https://', adapter)
+        self.default_http_timeout = http_timeout
         self.session = session
 
     def run_report(self, start_date, end_date,
@@ -353,7 +355,10 @@ def __api_request(self, method, endpoint, **kwargs):
         headers = {"Authorization": self.api_key,
                    'User-Agent': 'Singular API Client v%s' % __version__}
 
-        response = self.session.request(method, url, headers=headers, **kwargs)
+        response = self.session.request(method, url,
+                                        headers=headers,
+                                        timeout=self.default_http_timeout,
+                                        **kwargs)
 
         logger.info("%(method)s %(url)s, kwargs = %(kwargs)s --> code = %(code)s" %
                     dict(method=method, url=url, kwargs=repr(kwargs), code=response.status_code))

singular_api_client/version.py

@@ -1 +1 @@
-__version__ = "0.5.12"
+__version__ = "0.5.13"