feat: Update to draft 06 of json schema

yadage · Feb 13, 2023 · 147f408 · 147f408
1 parent ecdb57b
commit 147f408
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 27 deletions.
diff --git a/yadageschemas/packtivity/environment/docker-enc-schema.json b/yadageschemas/packtivity/environment/docker-enc-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Docker Encapsulated Environment",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/environment/localproc-schema.json b/yadageschemas/packtivity/environment/localproc-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Local Process Environment for Testing",
   "properties": {

diff --git a/yadageschemas/packtivity/environment/manual-instructions-env-schema.json b/yadageschemas/packtivity/environment/manual-instructions-env-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Manual Instructions Environment",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/environment/noop-env-schema.json b/yadageschemas/packtivity/environment/noop-env-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Noop Environment for Testing",
   "properties": {

diff --git a/yadageschemas/packtivity/packtivity-schema.json b/yadageschemas/packtivity/packtivity-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Packtivity Meta Description",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/process/manual-instructions-proc-schema.json b/yadageschemas/packtivity/process/manual-instructions-proc-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Manual Instructions Process",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/process/scriptproc-schema.json b/yadageschemas/packtivity/process/scriptproc-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "String Interpolated Script",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/process/stringinterp-schema.json b/yadageschemas/packtivity/process/stringinterp-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "String Interpolated Command",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/constant-pub-schema.json b/yadageschemas/packtivity/publisher/constant-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Constant Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/fromglob-pub-schema.json b/yadageschemas/packtivity/publisher/fromglob-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Glob Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/frompar-pub-schema.json b/yadageschemas/packtivity/publisher/frompar-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Parameter Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/fromparjq-pub-schema.json b/yadageschemas/packtivity/publisher/fromparjq-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Parameter Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/fromyaml-pub-schema.json b/yadageschemas/packtivity/publisher/fromyaml-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "YAML Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/interpolated-pub-schema.json b/yadageschemas/packtivity/publisher/interpolated-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Simple Interpolated Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/packtivity/publisher/manual-instructions-pub-schema.json b/yadageschemas/packtivity/publisher/manual-instructions-pub-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Manual Instructions Publisher",
   "additionalProperties": false,

diff --git a/yadageschemas/validator.py b/yadageschemas/validator.py
@@ -3,11 +3,11 @@
 
 from .dialects import raw_with_defaults
 assert raw_with_defaults
-from jsonschema import Draft4Validator
+from jsonschema import Draft6Validator
 
 def validator(schema_name,schemadir):
     schema, resolver = schema_and_refresolver(schema_name,schemadir)
-    return Draft4Validator(schema, resolver = resolver)
+    return Draft6Validator(schema, resolver = resolver)
 
 def validate_spec(data, validopts):
     return validator(**validopts).validate(data)
diff --git a/yadageschemas/yadage/predicates/exprfulfilled-schema.json b/yadageschemas/yadage/predicates/exprfulfilled-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "JSONPath ready predicate",
   "additionalProperties": false,

diff --git a/yadageschemas/yadage/predicates/jsonpathready-schema.json b/yadageschemas/yadage/predicates/jsonpathready-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "JSONPath ready predicate",
   "additionalProperties": false,

diff --git a/yadageschemas/yadage/scheduler/cases.json b/yadageschemas/yadage/scheduler/cases.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type":"array",
   "items":{
     "type":"object",

diff --git a/yadageschemas/yadage/scheduler/jq-stage-schema.json b/yadageschemas/yadage/scheduler/jq-stage-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "jq Scheduler",
   "additionalProperties": true,

diff --git a/yadageschemas/yadage/scheduler/multistep-stage-schema.json b/yadageschemas/yadage/scheduler/multistep-stage-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Multiple Step Scheduler",
   "additionalProperties": false,

diff --git a/yadageschemas/yadage/scheduler/parameterselection.json b/yadageschemas/yadage/scheduler/parameterselection.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type":"array",
   "title": "Parameter Selection",
   "items":{

diff --git a/yadageschemas/yadage/scheduler/singlestep-stage-schema.json b/yadageschemas/yadage/scheduler/singlestep-stage-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Single Step Scheduler",
   "additionalProperties": false,

diff --git a/yadageschemas/yadage/scheduler/value_registration.json b/yadageschemas/yadage/scheduler/value_registration.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object"
 }
diff --git a/yadageschemas/yadage/stage-schema.json b/yadageschemas/yadage/stage-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Yadage Stage",
   "additionalProperties": false,

diff --git a/yadageschemas/yadage/workflow-schema.json b/yadageschemas/yadage/workflow-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "title": "Yadage Workflow",
   "additionalProperties": false,