Merge d5097f0 into a342e9c

empiar_depositor/empiar_deposition.schema.json

@@ -1047,27 +1047,27 @@
       },
       "description": "Array of principal investigators."
     },
-    "scipion": {
-      "$id": "/properties/scipion",
+    "workflow_file": {
+      "$id": "/properties/workflow_file",
       "type": "object",
       "properties": {
-        "scipion_workflow": {
-          "$id": "/properties/scipion/items/properties/scipion_workflow",
+        "path": {
+          "$id": "/properties/workflow_file/items/properties/path",
           "type": [
             "null",
             "string"
           ],
-          "title": "The Scipion_workflow Schema ",
+          "title": "The relative path to the workflow file",
           "default": null,
           "maxLength": 200,
-          "description": "Scipion workflow file provides a great way to reproduce previous processing steps and is particularly useful to repeat steps for similar samples or to share knowledge between users.",
+          "description": "A workflow file, for example, a Scipion (http://scipion.i2pc.es) workflow provides a great way to reproduce previous processing steps and is particularly useful to repeat steps for similar samples or to share knowledge between users.",
           "examples": [
             "data/workflow.json"
           ]
         }
       },
       "required": [
-        "scipion_workflow"
+        "path"
       ]
     },
     "imagesets": {

empiar_depositor/empiar_depositor.py

@@ -19,6 +19,7 @@
 under the License.
 
 Version history
+1.6b27, 20211208, Andrii Iudin: Switched Scipion workflow field to a generic workflow file
 1.6b26, 20211208, Andrii Iudin: Fix of links in README.rst
 1.6b25, 20211015, Andrii Iudin: Added an option to specify workflows, JSON schema updated to the latest draft
 1.6b24, 20210729, Andrii Iudin: Switched to top url
@@ -544,7 +545,7 @@ def main(args=None):
     empiar-depositor -r 10 ABC123 -e ~/Downloads/dep_thumb.png 0123456789 -g 01234567-89a-bcde-fghi-jklmnopqrstu ~/Docu\
 ments/empiar_deposition_1.json ~/Downloads/micrographs
                 """
-        version = "1.6b26"
+        version = "1.6b27"
 
         possible_rights_help_text = "Rights can be 1 - Owner, 2 - View only, 3 - View and Edit, 4 - View, Edit and " \
                                     "Submit. There can be only one deposition owner."

empiar_depositor/tests/deposition_json/working_example.json

@@ -57,8 +57,8 @@
       "country": "US"
     }
   ],
-  "scipion": {
-    "scipion_workflow": "data/workflow.json"
+  "workflow_file": {
+    "path": "data/workflow.json"
   },
   "imagesets": [
     {

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='empiar-depositor',
-    version='1.6b26',
+    version='1.6b27',
     packages=find_packages(),
     author="Andrii Iudin",
     author_email="andrii@ebi.ac.uk, andrii.iudin@gmail.com",