arvados-python-client 2.7.3__tar.gz → 2.7.4__tar.gz

{arvados-python-client-2.7.3/arvados_python_client.egg-info → arvados-python-client-2.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: arvados-python-client
-Version: 2.7.3
+Version: 2.7.4
 Summary: Arvados client library
 Home-page: https://arvados.org
 Author: Arvados

arvados-python-client-2.7.4/arvados/_version.py

@@ -0,0 +1 @@
+__version__ = '2.7.4'

{arvados-python-client-2.7.3 → arvados-python-client-2.7.4}/arvados/api.py

@@ -100,8 +100,8 @@ def _intercept_http_request(self, uri, method="GET", headers={}, **kwargs):
         self._last_request_time = time.time()
         try:
             response, body = self.orig_http_request(uri, method, headers=headers, **kwargs)
-        except ssl.SSLCertVerificationError as e:
-            raise ssl.SSLCertVerificationError(e.args[0], "Could not connect to %s\n%s\nPossible causes: remote SSL/TLS certificate expired, or was issued by an untrusted certificate authority." % (uri, e)) from None
+        except ssl.CertificateError as e:
+            raise ssl.CertificateError(e.args[0], "Could not connect to %s\n%s\nPossible causes: remote SSL/TLS certificate expired, or was issued by an untrusted certificate authority." % (uri, e)) from None
         # googleapiclient only retries 403, 429, and 5xx status codes.
         # If we got another 4xx status that we want to retry, convert it into
         # 5xx so googleapiclient handles it the way we want.

{arvados-python-client-2.7.3 → arvados-python-client-2.7.4}/arvados/commands/arv_copy.py

@@ -331,8 +331,12 @@ def copy_workflow(wf_uuid, src, dst, args):
                "ARVADOS_API_TOKEN": src.api_token,
                "PATH": os.environ["PATH"]}
         try:
-            result = subprocess.run(["arvados-cwl-runner", "--quiet", "--print-keep-deps", "arvwf:"+wf_uuid],
-                                    capture_output=True, env=env)
+            result = subprocess.run(
+                ["arvados-cwl-runner", "--quiet", "--print-keep-deps", "arvwf:"+wf_uuid],
+                env=env,
+                stdout=subprocess.PIPE,
+                universal_newlines=True,
+            )
         except FileNotFoundError:
             no_arv_copy = True
         else:

{arvados-python-client-2.7.3 → arvados-python-client-2.7.4/arvados_python_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: arvados-python-client
-Version: 2.7.3
+Version: 2.7.4
 Summary: Arvados client library
 Home-page: https://arvados.org
 Author: Arvados

{arvados-python-client-2.7.3 → arvados-python-client-2.7.4}/tests/test_cmd_util.py

@@ -162,7 +162,9 @@ class JSONArgumentTestCase(unittest.TestCase):
                 finally:
                     os.chmod(bad_file.fileno(), 0o600)
         else:
-            ctx = contextlib.nullcontext
+            @contextlib.contextmanager
+            def ctx():
+                yield
         with self.assertRaisesRegex(ValueError, rf'^error reading JSON file path {str(path)!r}: '), ctx():
             self.parser(str(path))
 

{arvados-python-client-2.7.3 → arvados-python-client-2.7.4}/tests/test_keep_client.py

@@ -1644,9 +1644,12 @@ class KeepDiskCacheTestCase(unittest.TestCase, tutil.ApiClientMock):
 
 
     def test_disk_cache_retry_write_error(self):
-        block_cache = arvados.keep.KeepBlockCache(disk_cache=True,
-                                                  disk_cache_dir=self.disk_cache_dir)
-
+        cache_max_before = 512 * 1024 * 1024
+        block_cache = arvados.keep.KeepBlockCache(
+            cache_max=cache_max_before,
+            disk_cache=True,
+            disk_cache_dir=self.disk_cache_dir,
+        )
         keep_client = arvados.KeepClient(api_client=self.api_client, block_cache=block_cache)
 
         called = False
@@ -1659,11 +1662,7 @@ class KeepDiskCacheTestCase(unittest.TestCase, tutil.ApiClientMock):
             else:
                 return realmmap(*args, **kwargs)
 
-        with patch('mmap.mmap') as mockmmap:
-            mockmmap.side_effect = sideeffect_mmap
-
-            cache_max_before = block_cache.cache_max
-
+        with patch('mmap.mmap', autospec=True, side_effect=sideeffect_mmap) as mockmmap:
             with tutil.mock_keep_responses(self.data, 200) as mock:
                 self.assertTrue(tutil.binary_compare(keep_client.get(self.locator), self.data))
 
@@ -1673,7 +1672,7 @@ class KeepDiskCacheTestCase(unittest.TestCase, tutil.ApiClientMock):
             self.assertTrue(tutil.binary_compare(f.read(), self.data))
 
         # shrank the cache in response to ENOSPC
-        self.assertTrue(cache_max_before > block_cache.cache_max)
+        self.assertGreater(cache_max_before, block_cache.cache_max)
 
 
     def test_disk_cache_retry_write_error2(self):
@@ -1692,9 +1691,7 @@ class KeepDiskCacheTestCase(unittest.TestCase, tutil.ApiClientMock):
             else:
                 return realmmap(*args, **kwargs)
 
-        with patch('mmap.mmap') as mockmmap:
-            mockmmap.side_effect = sideeffect_mmap
-
+        with patch('mmap.mmap', autospec=True, side_effect=sideeffect_mmap) as mockmmap:
             slots_before = block_cache._max_slots
 
             with tutil.mock_keep_responses(self.data, 200) as mock:
@@ -1706,4 +1703,4 @@ class KeepDiskCacheTestCase(unittest.TestCase, tutil.ApiClientMock):
             self.assertTrue(tutil.binary_compare(f.read(), self.data))
 
         # shrank the cache in response to ENOMEM
-        self.assertTrue(slots_before > block_cache._max_slots)
+        self.assertGreater(slots_before, block_cache._max_slots)

arvados-python-client-2.7.3/arvados/_version.py

@@ -1 +0,0 @@
-__version__ = '2.7.3'