Use anyOf

jupyterhub · Nov 14, 2024 · 73331f2 · 73331f2
1 parent 6531b6b
commit 73331f2
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/tljh/config_schema.py b/tljh/config_schema.py
@@ -79,23 +79,16 @@
             "description": "User CPU and memory limits.",
             "type": "object",
             "additionalProperties": False,
-            "properties": {"memory": {"type": "string"}, "cpu": {
-            "oneOf": [
-                {
-                  "type": "integer",
-                  "minimum": 0
-                },
-                {
-                  "type": "number",
-                  "minimum": 0
+            "properties": {
+                "memory": {"type": "string"},
+                "cpu": {
+                    "anyOf": [
+                        {"type": "integer", "minimum": 0},
+                        {"type": "number", "minimum": 0},
+                        {"type": "string", "enum": ["None"]},
+                    ]
                 },
-                {
-                  "type": "string",
-                  "enum": ["None"]
-                }
-            ]
-          }
-        },
+            },
         },
         "UserEnvironment": {
             "type": "object",