[ARVADOS] updated: 1.3.0-403-gd9e5d620d

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py       | 2 +-
 sdk/cwl/setup.py                          | 1 +
 sdk/python/arvados/commands/keepdocker.py | 4 ++--
 sdk/python/setup.py                       | 1 +
 services/fuse/arvados_fuse/fresh.py       | 2 +-
 services/fuse/setup.py                    | 3 +++
 6 files changed, 9 insertions(+), 4 deletions(-)

       via  d9e5d620d8e68b349bb79b9749a74110603a89d4 (commit)
       via  ffef38539dd36e224abb75f0480cff1deb319124 (commit)
      from  d0584563200b0fe69e508b2fc5b0ddb223ebccc0 (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 d9e5d620d8e68b349bb79b9749a74110603a89d4
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Feb 28 15:18:55 2019 -0500

    14885: Adds python2 conditional pytz import
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 20a601802..d97e7428d 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -43,6 +43,7 @@ setup(name='arvados-cwl-runner',
       ],
       extras_require={
           ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'],
+          ':python_version<"3"': ['pytz'],
       },
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index f4b4012a0..ffca23495 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -57,6 +57,7 @@ setup(name='arvados-python-client',
       ],
       extras_require={
           ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'],
+          ':python_version<"3"': ['pytz'],
       },
       classifiers=[
           'Programming Language :: Python :: 2',
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index f2e385fa7..9b4b997cd 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -45,6 +45,9 @@ setup(name='arvados_fuse',
         'ciso8601 >= 2.0.0',
         'setuptools'
         ],
+      extras_require={
+          ':python_version<"3"': ['pytz'],
+      },
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
       zip_safe=False

commit ffef38539dd36e224abb75f0480cff1deb319124
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Feb 28 15:17:31 2019 -0500

    14885: Removes as_naive datetime parsing distinction
    
    parse_datetime_as_naive should only be used in instances where we want to parse a string that we know contains timezone info AND  we do not want to include it in the resulting datetime object. Otherwise, parse_datetime is preferred for parsing strings with or without timezone info.
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 461f5b66a..1261e94a5 100644
--- 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_as_naive(record["modified_at"]) + datetime.timedelta(0, self.arvrunner.intermediate_output_ttl)
+                    trash_at = ciso8601.parse_datetime(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/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index ec2a9942a..e596e6691 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -230,12 +230,12 @@ def docker_link_sort_key(link):
     Docker metadata links to sort them from least to most preferred.
     """
     try:
-        image_timestamp = ciso8601.parse_datetime_as_naive(
+        image_timestamp = ciso8601.parse_datetime(
             link['properties']['image_timestamp'])
     except (KeyError, ValueError):
         image_timestamp = EARLIEST_DATETIME
     try:
-        created_timestamp = ciso8601.parse_datetime_as_naive(link['created_at'])
+        created_timestamp = ciso8601.parse_datetime(link['created_at'])
     except ValueError:
         created_timestamp = None
     return (image_timestamp, created_timestamp)
diff --git a/services/fuse/arvados_fuse/fresh.py b/services/fuse/arvados_fuse/fresh.py
index 2e7a2a818..acebe2b1b 100644
--- 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_as_naive(t).timetuple())
+        return calendar.timegm(ciso8601.parse_datetime(t).timetuple())
     except (TypeError, ValueError):
         return 0
 

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


hooks/post-receive
--