14885: Updates sdk/cwl and services/fuse ciso8601 dependency

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index af7c02a8f30010bfe85e51a6928e63a5a617d37e..461f5b66a563403fdad056073cebe56802818cb5 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -342,7 +342,7 @@ class ArvadosContainer(JobBase):
             if record["output_uuid"]:
                 if self.arvrunner.trash_intermediate or self.arvrunner.intermediate_output_ttl:
                     # Compute the trash time to avoid requesting the collection record.
-                    trash_at = ciso8601.parse_datetime_unaware(record["modified_at"]) + datetime.timedelta(0, self.arvrunner.intermediate_output_ttl)
+                    trash_at = ciso8601.parse_datetime_as_naive(record["modified_at"]) + datetime.timedelta(0, self.arvrunner.intermediate_output_ttl)
                     aftertime = " at %s" % trash_at.strftime("%Y-%m-%d %H:%M:%S UTC") if self.arvrunner.intermediate_output_ttl else ""
                     orpart = ", or" if self.arvrunner.trash_intermediate and self.arvrunner.intermediate_output_ttl else ""
                     oncomplete = " upon successful completion of the workflow" if self.arvrunner.trash_intermediate else ""

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index a815dedaf3a30924145939598b476c1302915bcb..20a601802d586eb4d5c9fd2d5dc3853aaa69c233 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,7 +39,7 @@ setup(name='arvados-cwl-runner',
           'ruamel.yaml >=0.15.54, <=0.15.77',
           'arvados-python-client>=1.3.0.20190205182514',
           'setuptools',
-          'ciso8601 >=1.0.6, <2.0.0',
+          'ciso8601 >= 2.0.0',
       ],
       extras_require={
           ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'],

diff --git a/services/fuse/arvados_fuse/fresh.py b/services/fuse/arvados_fuse/fresh.py
index 2a3a19c54c66005a6f96cd8d1dbd6de3c6345aad..2e7a2a8182b62e2ffe8aa474a75c1f35b2723a43 100644 (file)
--- a/services/fuse/arvados_fuse/fresh.py
+++ b/services/fuse/arvados_fuse/fresh.py
@@ -12,7 +12,7 @@ def convertTime(t):
     if not t:
         return 0
     try:
-        return calendar.timegm(ciso8601.parse_datetime_unaware(t).timetuple())
+        return calendar.timegm(ciso8601.parse_datetime_as_naive(t).timetuple())
     except (TypeError, ValueError):
         return 0
 

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 5a1aa809146db0f4b5a89e32390877963302e9e6..f2e385fa73cdd2cea27ac6bbea6f28494928b3ca 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -42,7 +42,7 @@ setup(name='arvados_fuse',
         # llfuse 1.3.4 fails to install via pip
         'llfuse >=1.2, <1.3.4',
         'python-daemon',
-        'ciso8601 >=1.0.6, <2.0.0',
+        'ciso8601 >= 2.0.0',
         'setuptools'
         ],
       test_suite='tests',