[ARVADOS] created: 1.3.0-401-gd05845632
Git user
git at public.curoverse.com
Wed Feb 27 14:25:31 EST 2019
at d0584563200b0fe69e508b2fc5b0ddb223ebccc0 (commit)
commit d0584563200b0fe69e508b2fc5b0ddb223ebccc0
Merge: 8fd360faf 08123387f
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date: Wed Feb 27 14:24:58 2019 -0500
Merge branch 'master' into 14885-ciso-and-conda-packaging-pr
refs #14885
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
commit 8fd360faf91921c557f44f079b127a4fa5830486
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date: Wed Feb 27 14:23:21 2019 -0500
14885: Updates sdk/cwl and services/fuse ciso8601 dependency
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 af7c02a8f..461f5b66a 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_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 a815dedaf..20a601802 100644
--- 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 2a3a19c54..2e7a2a818 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_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 5a1aa8091..f2e385fa7 100644
--- 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',
commit a1aefe79abf1d84ee9bec3b5896a7ba30d42e014
Author: chapmanb <chapmanb at 50mail.com>
Date: Sun Feb 24 05:46:26 2019 -0500
Python 3: move to recent ciso8601 2.x branch
Older ciso8601 versions are not built for Python 3.7 which
prevents migration to latest Python on conda packaging. This
swaps over usage to match the breaking 2.x changes:
https://github.com/closeio/ciso8601/blob/master/CHANGELOG.md#v1xx---200-migration-guide
Arvados-DCO-1.1-Signed-off-by: Brad Chapman <chapmanb at fastmail.com>
diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 7ad07cc60..5b1f1a2a6 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -1347,7 +1347,10 @@ class Collection(RichCollectionBase):
def get_trash_at(self):
if self._api_response and self._api_response["trash_at"]:
- return ciso8601.parse_datetime(self._api_response["trash_at"])
+ try:
+ return ciso8601.parse_datetime(self._api_response["trash_at"])
+ except ValueError:
+ return None
else:
return None
diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index ac387a6f6..ec2a9942a 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -230,12 +230,15 @@ def docker_link_sort_key(link):
Docker metadata links to sort them from least to most preferred.
"""
try:
- image_timestamp = ciso8601.parse_datetime_unaware(
+ image_timestamp = ciso8601.parse_datetime_as_naive(
link['properties']['image_timestamp'])
except (KeyError, ValueError):
image_timestamp = EARLIEST_DATETIME
- return (image_timestamp,
- ciso8601.parse_datetime_unaware(link['created_at']))
+ try:
+ created_timestamp = ciso8601.parse_datetime_as_naive(link['created_at'])
+ except ValueError:
+ created_timestamp = None
+ return (image_timestamp, created_timestamp)
def _get_docker_links(api_client, num_retries, **kwargs):
links = arvados.util.list_all(api_client.links().list,
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index aaa071033..f4b4012a0 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -46,7 +46,7 @@ setup(name='arvados-python-client',
('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
],
install_requires=[
- 'ciso8601 >=1.0.6, <2.0.0',
+ 'ciso8601 >=2.0.0',
'future',
'google-api-python-client >=1.6.2, <1.7',
'httplib2 >=0.9.2',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list