[ARVADOS] updated: 262dfdbc9e795d258e8b2b0951784da2efcde080

Git user git at public.curoverse.com
Tue Mar 28 09:30:18 EDT 2017


Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 2 ++
 sdk/cwl/arvados_cwl/runner.py   | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

       via  262dfdbc9e795d258e8b2b0951784da2efcde080 (commit)
      from  c627686e99abcc8508323dc6c1a6fae8507f9b2f (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 262dfdbc9e795d258e8b2b0951784da2efcde080
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 27 17:29:58 2017 -0400

    10401: Override relaxed path checks to be even more relaxed.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index ed3a995..d006629 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -11,6 +11,7 @@ import threading
 import hashlib
 import copy
 import json
+import re
 from functools import partial
 import pkg_resources  # part of setuptools
 
@@ -628,6 +629,7 @@ def arg_parser():  # type: () -> argparse.ArgumentParser
     return parser
 
 def add_arv_hints():
+    cwltool.draft2tool.ACCEPTLIST_EN_RELAXED_RE = re.compile(r".*")
     res = pkg_resources.resource_stream(__name__, 'arv-cwl-schema.yml')
     use_custom_schema("v1.0", "http://arvados.org/cwl", res.read())
     res.close()
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 49047fa..1c10fe8 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -3,7 +3,6 @@ import urlparse
 from functools import partial
 import logging
 import json
-import re
 import subprocess
 
 from StringIO import StringIO
@@ -30,8 +29,6 @@ from . import done
 
 logger = logging.getLogger('arvados.cwl-runner')
 
-cwltool.draft2tool.ACCEPTLIST_RE = re.compile(r".*")
-
 def trim_listing(obj):
     """Remove 'listing' field from Directory objects that are keep references.
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list