Move SPARQL to tests and update create_ro_crate

workflowhub-eu · Sep 11, 2024 · 9d74326 · 9d74326
1 parent a71cdc6
commit 9d74326
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 7 deletions.
diff --git a/SPARQL/README.md → tests/SPARQL/README.md b/SPARQL/README.md → tests/SPARQL/README.md
diff --git a/tests/SPARQL/__init__.py b/tests/SPARQL/__init__.py
diff --git a/SPARQL/queries/01_is_rocrate.sparql → tests/SPARQL/queries/01_is_rocrate.sparql b/SPARQL/queries/01_is_rocrate.sparql → tests/SPARQL/queries/01_is_rocrate.sparql
diff --git a/SPARQL/queries/02_obtain_workflow_pid.sparql → ...RQL/queries/02_obtain_workflow_pid.sparql b/SPARQL/queries/02_obtain_workflow_pid.sparql → ...RQL/queries/02_obtain_workflow_pid.sparql
diff --git a/...et_containers_from_first_execution.sparql → ...et_containers_from_first_execution.sparql b/...et_containers_from_first_execution.sparql → ...et_containers_from_first_execution.sparql
diff --git a/...04_get_inputs_from_first_execution.sparql → ...04_get_inputs_from_first_execution.sparql b/...04_get_inputs_from_first_execution.sparql → ...04_get_inputs_from_first_execution.sparql
diff --git a/...t_environment_from_first_execution.sparql → ...t_environment_from_first_execution.sparql b/...t_environment_from_first_execution.sparql → ...t_environment_from_first_execution.sparql
diff --git a/...6_get_outputs_from_first_execution.sparql → ...6_get_outputs_from_first_execution.sparql b/...6_get_outputs_from_first_execution.sparql → ...6_get_outputs_from_first_execution.sparql
diff --git a/...et_containers_declared_in_workflow.sparql → ...et_containers_declared_in_workflow.sparql b/...et_containers_declared_in_workflow.sparql → ...et_containers_declared_in_workflow.sparql
diff --git a/...04_get_inputs_declared_in_workflow.sparql → ...04_get_inputs_declared_in_workflow.sparql b/...04_get_inputs_declared_in_workflow.sparql → ...04_get_inputs_declared_in_workflow.sparql
diff --git a/...t_environment_declared_in_workflow.sparql → ...t_environment_declared_in_workflow.sparql b/...t_environment_declared_in_workflow.sparql → ...t_environment_declared_in_workflow.sparql
diff --git a/...6_get_outputs_declared_in_workflow.sparql → ...6_get_outputs_declared_in_workflow.sparql b/...6_get_outputs_declared_in_workflow.sparql → ...6_get_outputs_declared_in_workflow.sparql
diff --git a/SPARQL/query-rocrate-sparql.py → tests/SPARQL/query-rocrate-sparql.py b/SPARQL/query-rocrate-sparql.py → tests/SPARQL/query-rocrate-sparql.py
diff --git a/SPARQL/requirements.txt → tests/SPARQL/requirements.txt b/SPARQL/requirements.txt → tests/SPARQL/requirements.txt
diff --git a/workflowhub_graph/create_ro_crate.py b/workflowhub_graph/create_ro_crate.py
@@ -25,9 +25,10 @@ def create_ro_crate(input_file: str, workflow_file: str, output_dir: str) -> Non
     auth_1 = crate.add(
         Person(
             crate,
-            "https://orcid.org/0000-0000-0000-0000",
+            "https://orcid.org/0000-0003-1193-6632",
             properties={
-                "name": "Alexander Hambley",
+                "givenName": "Alexander",
+                "familyName": "Hambley",
                 "affiliation": "University of Manchester",
             },
         )
@@ -37,7 +38,8 @@ def create_ro_crate(input_file: str, workflow_file: str, output_dir: str) -> Non
             crate,
             "https://orcid.org/0000-0002-0035-6475",
             properties={
-                "name": "Eli Chadwick",
+                "givenName": "Eli",
+                "familyName": "Chadwick",
                 "affiliation": "University of Manchester",
             },
         )
@@ -47,7 +49,8 @@ def create_ro_crate(input_file: str, workflow_file: str, output_dir: str) -> Non
             crate,
             "https://orcid.org/0000-0002-4565-9760",
             properties={
-                "name": "Oliver Woolland",
+                "givenName": "Oliver",
+                "familyName": "Woolland",
                 "affiliation": "University of Manchester",
             },
         )
@@ -57,7 +60,8 @@ def create_ro_crate(input_file: str, workflow_file: str, output_dir: str) -> Non
             crate,
             "https://orcid.org/0000-0001-9842-9718",
             properties={
-                "name": "Stian Soiland-Reyes",
+                "givenName": "Stian",
+                "familyName": "Soiland-Reyes",
                 "affiliation": "University of Manchester",
             },
         )
@@ -67,12 +71,15 @@ def create_ro_crate(input_file: str, workflow_file: str, output_dir: str) -> Non
             crate,
             "https://orcid.org/0000-0001-6353-0808",
             properties={
-                "name": "Volodymyr Savchenko",
+                "givenName": "Volodymyr",
+                "familyName": "Savchenko",
                 "affiliation": "University of Geneva",
             },
         )
     )
 
+    crate.root_dataset["author"] = [auth_1, auth_2, auth_3, auth_4, auth_5]
+
     # Add dataset and files:
     crate.add_dataset(
         "./workflowhub_graph/",
@@ -139,7 +146,7 @@ def create_ro_crate(input_file: str, workflow_file: str, output_dir: str) -> Non
         )
 
     # Add license:
-    crate.license = "https://opensource.org/license/bsd-2-clause"
+    crate.license = "https://spdx.org/licenses/BSD-2-Clause.html"
 
     # Writing the RO-Crate metadata:
     crate.write(output_dir)