18002: Updating Python dependencies WIP

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 34fe0c15dd549f8f1641a8d203b9941979158186..28eb50603deb081b2efd67d721b996d1bdf4333a 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,8 +39,8 @@ setup(name='arvados-cwl-runner',
       # file to determine what version of cwltool and schema-salad to
       # build.
       install_requires=[
-          'cwltool==3.0.20210319143721',
-          'schema-salad==7.1.20210611090601',
+          'cwltool==3.1.20210816212154',
+          'schema-salad==8.1.20210627200047',
           'arvados-python-client{}'.format(pysdk_dep),
           'setuptools',
           'ciso8601 >= 2.0.0',

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 9dfe0436dec9bdf22eb71ad9bfe2e8a201ee3ab6..bc07851835e2471ee9f1055b689fe6a789ea4d62 100644 (file)
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -720,11 +720,11 @@ class KeepClient(object):
             result = service.last_result()
 
             if not success:
-                if result.get('status_code', None):
+                if result.get('status_code'):
                     _logger.debug("Request fail: PUT %s => %s %s",
                                   self.data_hash,
-                                  result['status_code'],
-                                  result['body'])
+                                  result.get('status_code'),
+                                  result.get('body'))
                 raise self.TaskFailed()
 
             _logger.debug("KeepWriterThread %s succeeded %s+%i %s",

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index ef95674a6477b9ba1d57c91b2544022232bc206c..40e6e18ab9c480fba9251e838aefab7454820a7a 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -48,10 +48,10 @@ setup(name='arvados-python-client',
       install_requires=[
           'ciso8601 >=2.0.0',
           'future',
-          'google-api-python-client >=1.6.2, <1.7',
+          'google-api-python-client >=1.6.2, <2',
           'httplib2 >=0.9.2',
           'pycurl >=7.19.5.1',
-          'ruamel.yaml >=0.15.54, <=0.16.5',
+          'ruamel.yaml >=0.15.54, <=0.17.11',
           'setuptools',
           'ws4py >=0.4.2',
       ],

diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index b1c42fd2b3a1475934a0c6090e12139750210f46..b2160e549b538655eb5863907d87fb1560ce3ba5 100644 (file)
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -1300,6 +1300,8 @@ class AvoidOverreplication(unittest.TestCase, tutil.ApiClientMock):
         def last_result(self):
             if self.will_succeed:
                 return self._result
+            else:
+                return {"status_code": 500, "body": "didn't succeed"}
 
         def finished(self):
             return False