[ARVADOS] updated: 1.3.0-155-gf27fcfafc

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/executor.py |  8 ++++----
 sdk/cwl/tests/test_urljoin.py   | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

       via  f27fcfafc8f913780e59f830587aed447cb9a5ab (commit)
       via  f13d808554e0f64713c3d6636fbddf5e927e9e1a (commit)
      from  07782f1743267638c996cb1d9bb3a85f24c8243e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f27fcfafc8f913780e59f830587aed447cb9a5ab
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Tue Jan 15 11:09:11 2019 -0500

    13306: Updating depreciated assertEquals
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/tests/test_urljoin.py b/sdk/cwl/tests/test_urljoin.py
index 948f31d4f..86a053ea4 100644
--- a/sdk/cwl/tests/test_urljoin.py
+++ b/sdk/cwl/tests/test_urljoin.py
@@ -23,37 +23,37 @@ class TestUrljoin(unittest.TestCase):
 
         cf = CollectionFetcher({}, None)
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/hw.py",
+        self.assertEqual("keep:99999999999999999999999999999991+99/hw.py",
                           cf.urljoin("keep:99999999999999999999999999999991+99", "hw.py"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/hw.py",
+        self.assertEqual("keep:99999999999999999999999999999991+99/hw.py",
                           cf.urljoin("keep:99999999999999999999999999999991+99/", "hw.py"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/hw.py#main",
+        self.assertEqual("keep:99999999999999999999999999999991+99/hw.py#main",
                           cf.urljoin("keep:99999999999999999999999999999991+99", "hw.py#main"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/hw.py#main",
+        self.assertEqual("keep:99999999999999999999999999999991+99/hw.py#main",
                           cf.urljoin("keep:99999999999999999999999999999991+99/hw.py", "#main"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/dir/hw.py#main",
+        self.assertEqual("keep:99999999999999999999999999999991+99/dir/hw.py#main",
                           cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "#main"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/dir/wh.py",
+        self.assertEqual("keep:99999999999999999999999999999991+99/dir/wh.py",
                           cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "wh.py"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/wh.py",
+        self.assertEqual("keep:99999999999999999999999999999991+99/wh.py",
                           cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "/wh.py"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/wh.py#main",
+        self.assertEqual("keep:99999999999999999999999999999991+99/wh.py#main",
                           cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "/wh.py#main"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/wh.py",
+        self.assertEqual("keep:99999999999999999999999999999991+99/wh.py",
                           cf.urljoin("keep:99999999999999999999999999999991+99/hw.py#main", "wh.py"))
 
-        self.assertEquals("keep:99999999999999999999999999999992+99",
+        self.assertEqual("keep:99999999999999999999999999999992+99",
                           cf.urljoin("keep:99999999999999999999999999999991+99", "keep:99999999999999999999999999999992+99"))
 
-        self.assertEquals("keep:99999999999999999999999999999991+99/dir/wh.py",
+        self.assertEqual("keep:99999999999999999999999999999991+99/dir/wh.py",
                           cf.urljoin("keep:99999999999999999999999999999991+99/dir/", "wh.py"))
 
     def test_resolver(self):

commit f13d808554e0f64713c3d6636fbddf5e927e9e1a
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Tue Jan 15 10:52:04 2019 -0500

    13306: Updating depreciated warn function
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index ffbc6a439..60ea2ce82 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -162,7 +162,7 @@ class ArvCwlExecutor(object):
                 raise Exception("Unsupported API '%s', expected one of %s" % (arvargs.work_api, expected_api))
 
         if self.work_api == "jobs":
-            logger.warn("""
+            logger.warning("""
 *******************************
 Using the deprecated 'jobs' API.
 
@@ -356,7 +356,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                     try:
                         proc_states = table.list(filters=[["uuid", "in", page]]).execute(num_retries=self.num_retries)
                     except Exception as e:
-                        logger.warn("Error checking states on API server: %s", e)
+                        logger.warning("Error checking states on API server: %s", e)
                         remain_wait = self.poll_interval
                         continue
 
@@ -388,7 +388,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
             try:
                 self.api.collections().delete(uuid=i).execute(num_retries=self.num_retries)
             except:
-                logger.warn("Failed to delete intermediate output: %s", sys.exc_info()[1], exc_info=(sys.exc_info()[1] if self.debug else False))
+                logger.warning("Failed to delete intermediate output: %s", sys.exc_info()[1], exc_info=(sys.exc_info()[1] if self.debug else False))
             if sys.exc_info()[0] is KeyboardInterrupt or sys.exc_info()[0] is SystemExit:
                 break
 
@@ -450,7 +450,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                 logger.error("Creating CollectionReader for '%s' '%s': %s", k, v, e)
                 raise
             except IOError as e:
-                logger.warn("While preparing output collection: %s", e)
+                logger.warning("While preparing output collection: %s", e)
 
         def rewrite(fileobj):
             fileobj["location"] = generatemapper.mapper(fileobj["location"]).target

-----------------------------------------------------------------------


hooks/post-receive
--