Merge pull request #138 from epics-containers/dependabot/pip/pydantic…

…-2.5.0 Bump pydantic from 2.3.0 to 2.5.0
epics-containers · Nov 13, 2023 · 653c00e · 653c00e
2 parents 1de3a19 + 3cef947
commit 653c00e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ classifiers = [
 ]
 description = "IOC Builder for EPICS and Kubernetes"
 dependencies = [
-    "pydantic==2.3.0",
+    "pydantic==2.5.0",
     "typer",
     "ruamel.yaml",
     "jinja2",

diff --git a/tests/samples/schemas/multiple.ibek.ioc.schema.json b/tests/samples/schemas/multiple.ibek.ioc.schema.json
@@ -238,7 +238,16 @@
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
-        "anyOf": [
+        "discriminator": {
+          "mapping": {
+            "module.AllObject": "#/$defs/module_AllObject",
+            "object_module.Consumer": "#/$defs/object_module_Consumer",
+            "object_module.ConsumerTwo": "#/$defs/object_module_ConsumerTwo",
+            "object_module.RefObject": "#/$defs/object_module_RefObject"
+          },
+          "propertyName": "type"
+        },
+        "oneOf": [
           {
             "$ref": "#/$defs/object_module_RefObject"
           },

diff --git a/tests/samples/schemas/objects.ibek.ioc.schema.json b/tests/samples/schemas/objects.ibek.ioc.schema.json
@@ -119,7 +119,15 @@
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
-        "anyOf": [
+        "discriminator": {
+          "mapping": {
+            "object_module.Consumer": "#/$defs/object_module_Consumer",
+            "object_module.ConsumerTwo": "#/$defs/object_module_ConsumerTwo",
+            "object_module.RefObject": "#/$defs/object_module_RefObject"
+          },
+          "propertyName": "type"
+        },
+        "oneOf": [
           {
             "$ref": "#/$defs/object_module_RefObject"
           },

diff --git a/tests/samples/schemas/utils.ibek.ioc.schema.json b/tests/samples/schemas/utils.ibek.ioc.schema.json
@@ -82,7 +82,14 @@
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
-        "anyOf": [
+        "discriminator": {
+          "mapping": {
+            "epics.InterruptVectorVME": "#/$defs/epics_InterruptVectorVME",
+            "epics.InterruptVectorVME2": "#/$defs/epics_InterruptVectorVME2"
+          },
+          "propertyName": "type"
+        },
+        "oneOf": [
           {
             "$ref": "#/$defs/epics_InterruptVectorVME"
           },