feat: bump store and madwizard to pick up venv and expansion keying support

starpit · starpit · commit db3a48f7a915 · 2022-12-01T16:29:18.000-05:00
Also bumps kind tests to use ray 2.1.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/plugin-madwizard/package.json b/plugins/plugin-madwizard/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "madwizard": "^1.9.1",
-    "@guidebooks/store": "^1.4.3"
+    "madwizard": "^1.10.1",
+    "@guidebooks/store": "^1.6.0"
   }
 }
diff --git a/tests/kind/profiles/gpu1/keep-it-simple b/tests/kind/profiles/gpu1/keep-it-simple
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"1\",\"Number of GPUs\":\"1\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"5Gi\",\"Head Memory\":\"1.5Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu1/keep-it-simple b/tests/kind/profiles/non-gpu1/keep-it-simple
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu1/mcad-coscheduler b/tests/kind/profiles/non-gpu1/mcad-coscheduler
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu1/mcad-default b/tests/kind/profiles/non-gpu1/mcad-default
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu1/mcad-preinstalled b/tests/kind/profiles/non-gpu1/mcad-preinstalled
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu1/ray-autoscaler b/tests/kind/profiles/non-gpu1/ray-autoscaler
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu2/keep-it-simple b/tests/kind/profiles/non-gpu2/keep-it-simple
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-pips\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu3/keep-it-simple b/tests/kind/profiles/non-gpu3/keep-it-simple
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-conda\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
diff --git a/tests/kind/profiles/non-gpu4/keep-it-simple b/tests/kind/profiles/non-gpu4/keep-it-simple
@@ -12,7 +12,7 @@
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
     "ml/codeflare/training/byoc/working-directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-conda\"}",
-    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
+    "ml/codeflare/training/byoc/base-ray-image": "{\"Provide custom base image, if any\":\"rayproject/ray:2.1.0\"}",
     "s3/choose/instance-maybe": "My data is not stored in S3",
     "ml/ray/start/resources": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\"}",
     "kubernetes/context": "kind-codeflare-test",

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"access": "public"`
`24`	`24`	`},`
`25`	`25`	`"dependencies": {`
`26`		`- "madwizard": "^1.9.1",`
`27`		`- "@guidebooks/store": "^1.4.3"`
	`26`	`+ "madwizard": "^1.10.1",`
	`27`	`+ "@guidebooks/store": "^1.6.0"`
`28`	`28`	`}`
`29`	`29`	`}`