MRG: Merge pull request #95 from octue/enhancement/simplify-manifest-…

…schema

Simplify twine and manifest schemas

.pre-commit-config.yaml

@@ -67,7 +67,7 @@ repos:
           - '^hotfix/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
           - '^refactor/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
           - '^review/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
-          - '^release/(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
+          - '^enhancement/([a-z][a-z0-9]*)(-[a-z0-9]+)*$'
 
   - repo: https://github.com/octue/pre-commit-hooks
     rev: 0.5.0

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="twined",
-    version="0.1.2",
+    version="0.2.0",
     py_modules=[],
     install_requires=["jsonschema ~= 3.2.0", "python-dotenv"],
     url="https://www.github.com/octue/twined",

tests/data/apps/empty_app/twine.json

@@ -12,7 +12,7 @@
 	"credentials": [
 	],
 	"input_manifest": {
-		"datasets": []
+		"datasets": {}
 	},
 	"input_values_schema": {
 		"$schema": "http://json-schema.org/2019-09/schema#",
@@ -23,7 +23,7 @@
 		}
 	},
 	"output_manifest": {
-		"datasets": []
+		"datasets": {}
 	},
 	"output_values_schema": {
 		"title": "Output Values",

tests/data/apps/example_app/twine.json

@@ -32,16 +32,14 @@
 		}
 	],
 	"input_manifest": {
-		"datasets": [
-			{
-				"key": "met_mast_data",
+		"datasets": {
+			"met_mast_data": {
 				"purpose": "A dataset containing meteorological mast data"
 			},
-			{
-				"key": "scada_data",
+			"scada_data": {
 				"purpose": "A dataset containing scada data"
 			}
-		]
+		}
 	},
 	"input_values_schema": {
 		"$schema": "http://json-schema.org/2019-09/schema#",
@@ -57,12 +55,11 @@
 		}
 	},
 	"output_manifest": {
-		"datasets": [
-			{
-				"key": "production_data",
+		"datasets": {
+			"production_data": {
 				"purpose": "A dataset containing production data"
 			}
-		]
+		}
 	},
 	"output_values_schema": {
 		"title": "Output Values",

tests/data/apps/simple_app/twine.json

@@ -68,6 +68,6 @@
 		}
 	},
 	"output_manifest": {
-		"datasets": []
+		"datasets": {}
 	}
 }