From a676c6bea0b861795ffdb97cecb1b0475765728b Mon Sep 17 00:00:00 2001 From: simleo Date: Tue, 8 Mar 2022 15:54:26 +0100 Subject: [PATCH 1/2] consistent defaults for validate_url --- rocrate/rocrate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rocrate/rocrate.py b/rocrate/rocrate.py index 95f55d4..7c09b67 100644 --- a/rocrate/rocrate.py +++ b/rocrate/rocrate.py @@ -349,7 +349,7 @@ def add_file( source=None, dest_path=None, fetch_remote=False, - validate_url=True, + validate_url=False, properties=None ): return self.add(File( @@ -366,7 +366,7 @@ def add_dataset( source=None, dest_path=None, fetch_remote=False, - validate_url=True, + validate_url=False, properties=None ): return self.add(Dataset( @@ -490,7 +490,7 @@ def write_zip(self, out_path): return archive def add_workflow( - self, source=None, dest_path=None, fetch_remote=False, validate_url=True, properties=None, + self, source=None, dest_path=None, fetch_remote=False, validate_url=False, properties=None, main=False, lang="cwl", lang_version=None, gen_cwl=False, cls=ComputationalWorkflow ): workflow = self.add(cls( @@ -557,7 +557,7 @@ def add_test_instance(self, suite, url, resource="", service="jenkins", identifi return instance def add_test_definition( - self, suite, source=None, dest_path=None, fetch_remote=False, validate_url=True, properties=None, + self, suite, source=None, dest_path=None, fetch_remote=False, validate_url=False, properties=None, engine="planemo", engine_version=None ): if engine_version is None: From 87aa7c8c840281fa8e0d561d201904dd6e0e3cd8 Mon Sep 17 00:00:00 2001 From: simleo Date: Wed, 9 Mar 2022 15:46:44 +0100 Subject: [PATCH 2/2] do not auto-update url property in remote data entties --- rocrate/model/file_or_dir.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rocrate/model/file_or_dir.py b/rocrate/model/file_or_dir.py index 1dec3f4..8cb3259 100644 --- a/rocrate/model/file_or_dir.py +++ b/rocrate/model/file_or_dir.py @@ -43,7 +43,6 @@ def __init__(self, crate, source=None, dest_path=None, fetch_remote=False, raise ValueError("dest_path must be provided if source is not a path or URI") if is_url(str(source)): identifier = os.path.basename(source) if fetch_remote else source - properties.update({'url': source}) else: identifier = os.path.basename(source) super().__init__(crate, identifier, properties)