Merge branch 'L2SS-1418-fix_jsonschema' into 'master'

L2SS-1418: jsonschema 4.18 update broke our build

Closes L2SS-1418

See merge request !662

docker-compose/http-json-schemas/definitions/station-configuration.json

@@ -27,28 +27,28 @@
       "additionalProperties": false,
       "patternProperties": {
         "^[\\-\\w]+$": {
-          "$ref": "#/definitions/server"
+          "$ref": "station-configuration.json#/$defs/server"
         }
       }
     },
     "classes": {
       "type": "object",
       "additionalProperties": {
-        "$ref": "#/definitions/device"
+        "$ref": "station-configuration.json#/$defs/device"
       },
       "properties": {
         "properties": {
-          "$ref": "#/definitions/property"
+          "$ref": "station-configuration.json#/$defs/property"
         }
       }
     }
   },
-  "definitions": {
+  "$defs": {
     "server": {
       "type": "object",
       "patternProperties": {
         "^[\\-\\w]+$": {
-          "$ref": "#/definitions/instance"
+          "$ref": "station-configuration.json#/$defs/instance"
         }
       }
     },
@@ -56,7 +56,7 @@
       "type": "object",
       "patternProperties": {
         "^[\\-\\w]+$": {
-          "$ref": "#/definitions/class"
+          "$ref": "station-configuration.json#/$defs/class"
         }
       }
     },
@@ -65,7 +65,7 @@
       "additionalProperties": false,
       "patternProperties": {
         "^[\\-\\w.@]+/[\\-\\w.@]+/[\\-\\w.@]+$": {
-          "$ref": "#/definitions/device"
+          "$ref": "station-configuration.json#/$defs/device"
         }
       }
     },
@@ -74,10 +74,10 @@
       "additionalProperties": false,
       "properties": {
         "properties": {
-          "$ref": "#/definitions/properties"
+          "$ref": "station-configuration.json#/$defs/properties"
         },
         "attribute_properties": {
-          "$ref": "#/definitions/attribute_properties"
+          "$ref": "station-configuration.json#/$defs/attribute_properties"
         },
         "alias": {
           "type": "string"
@@ -87,7 +87,7 @@
     "properties": {
       "type": "object",
       "additionalProperties": {
-        "$ref": "#/definitions/property"
+        "$ref": "station-configuration.json#/$defs/property"
       }
     },
     "property": {
@@ -99,20 +99,20 @@
     "attribute_properties": {
       "type": "object",
       "additionalProperties": {
-        "$ref": "#/definitions/attribute_property"
+        "$ref": "station-configuration.json#/$defs/attribute_property"
       }
     },
     "attribute_property": {
       "type": "object",
       "additionalProperties": {
-        "$ref": "#/definitions/property"
+        "$ref": "station-configuration.json#/$defs/property"
       }
     },
     "class_property": {
       "type": "object",
       "additionalProperties": {
         "type": "object",
-        "$ref": "#/definitions/property"
+        "$ref": "station-configuration.json#/$defs/property"
       }
     }
   }

tangostationcontrol/requirements.txt

@@ -10,7 +10,7 @@ psycopg2-binary >= 2.9.2 # LGPL
 pyasn1 == 0.4.8 # BSD, pinned because https://github.com/pyasn1/pyasn1/issues/28
 pysnmp >= 0.1.7 # BSD
 h5py >= 3.1.0 # BSD
-jsonschema == 4.17.3 # MIT
+jsonschema >= 4.18 # MIT
 docker >= 5.0.3 # Apache 2
 python-logstash-async >= 2.5.0 # MIT
 python-casacore >= 3.3.1 # LGPLv3