Skip to content

Commit

Permalink
Merge pull request #112 from simleo/update_remote_entity
Browse files Browse the repository at this point in the history
Updates to handling of remote data entities
  • Loading branch information
simleo authored Mar 9, 2022
2 parents 6fe2b48 + 87aa7c8 commit 3dba4a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion rocrate/model/file_or_dir.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions rocrate/rocrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 3dba4a1

Please sign in to comment.