From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 7 Apr 2017 18:18:57 +0000 (-0400)
Subject: 11237: Bump google-api-python-client to 1.6.2 for better compatability across
X-Git-Tag: 1.1.0~323^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/4405570376295039b4c00577535a394eb011f8ad

11237: Bump google-api-python-client to 1.6.2 for better compatability across
oauth2client and Python versions.
---

diff --git a/build/build.list b/build/build.list
index c9cdacabe1..5d1397bc3f 100644
--- a/build/build.list
+++ b/build/build.list
@@ -1,6 +1,6 @@
 #distribution(s)|name|version|iteration|type|architecture|extra fpm arguments
 debian8,ubuntu1204,centos7|python-gflags|2.0|2|python|all
-debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.4.2|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.6.2|2|python|all
 debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|oauth2client|1.5.2|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|pyasn1|0.1.7|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|pyasn1-modules|0.0.5|2|python|all
diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index b74f828f4b..b96a4c8bd3 100644
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -1,4 +1,3 @@
-import gflags
 import httplib
 import httplib2
 import logging
diff --git a/sdk/python/arvados/api.py b/sdk/python/arvados/api.py
index 1af50b3110..543725b516 100644
--- a/sdk/python/arvados/api.py
+++ b/sdk/python/arvados/api.py
@@ -44,7 +44,7 @@ class OrderedJsonModel(apiclient.model.JsonModel):
         return body
 
 
-def _intercept_http_request(self, uri, **kwargs):
+def _intercept_http_request(self, uri, method="GET", **kwargs):
     if (self.max_request_size and
         kwargs.get('body') and
         self.max_request_size < len(kwargs['body'])):
@@ -58,7 +58,7 @@ def _intercept_http_request(self, uri, **kwargs):
 
     kwargs['headers']['Authorization'] = 'OAuth2 %s' % self.arvados_api_token
 
-    retryable = kwargs.get('method', 'GET') in [
+    retryable = method in [
         'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT']
     retry_count = self._retry_count if retryable else 0
 
@@ -75,7 +75,7 @@ def _intercept_http_request(self, uri, **kwargs):
     for _ in range(retry_count):
         self._last_request_time = time.time()
         try:
-            return self.orig_http_request(uri, **kwargs)
+            return self.orig_http_request(uri, method, **kwargs)
         except httplib.HTTPException:
             _logger.debug("Retrying API request in %d s after HTTP error",
                           delay, exc_info=True)
@@ -93,7 +93,7 @@ def _intercept_http_request(self, uri, **kwargs):
         delay = delay * self._retry_delay_backoff
 
     self._last_request_time = time.time()
-    return self.orig_http_request(uri, **kwargs)
+    return self.orig_http_request(uri, method, **kwargs)
 
 def _patch_http_request(http, api_token):
     http.arvados_api_token = api_token
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index be10632091..7264973b82 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -45,12 +45,10 @@ setup(name='arvados-python-client',
           ('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
       ],
       install_requires=[
-          'google-api-python-client==1.4.2',
-          'oauth2client >=1.4.6, <2',
+          'google-api-python-client>=1.6.2',
           'ciso8601',
-          'httplib2',
+          'httplib2 >= 0.9.2',
           'pycurl >=7.19.5.1',
-          'python-gflags<3.0',
           'setuptools',
           'ws4py<0.4',
           'ruamel.yaml==0.13.7'