Updated Ray version to 2.20.0

Bobbins228 · Bobbins228 · commit c9047974b66b · 2024-06-05T10:50:06.000+01:00
Removed rayVersion from base template
diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
@@ -43,6 +43,7 @@ jobs:
           sudo rm -rf /opt/ghc
           sudo rm -rf "/usr/local/share/boost"
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo apt install python3.9
           docker rmi $(docker image ls -aq)
           echo "Final status:"
           df -h
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
@@ -108,7 +108,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 0
                 imagePullSecrets: []
-          rayVersion: 2.1.0
           workerGroupSpecs:
           - groupName: small-group-interactivetest
             maxReplicas: 2
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
@@ -97,7 +97,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 0
                 imagePullSecrets: []
-          rayVersion: 2.1.0
           workerGroupSpecs:
           - groupName: small-group-jobtest
             maxReplicas: 2
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
@@ -97,7 +97,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 0
                 imagePullSecrets: []
-          rayVersion: 2.1.0
           workerGroupSpecs:
           - groupName: small-group-raytest
             maxReplicas: 2
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,10 +20,10 @@ homepage = "https://github.com/project-codeflare/codeflare-sdk"
 keywords = ['codeflare', 'python', 'sdk', 'client', 'batch', 'scale']
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 openshift-client = "1.0.18"
 rich = "^12.5"
-ray = {version = "2.7.0", extras = ["data", "default"]}
+ray = {version = "2.20.0", extras = ["data", "default"]}
 kubernetes = ">= 25.3.0, < 27"
 codeflare-torchx = "0.6.0.dev2"
 cryptography = "40.0.2"
diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
@@ -20,8 +20,6 @@ spec:
         # finalizers:
         # - kubernetes
       spec:
-        # The version of Ray you are using. Make sure all Ray containers are running this version of Ray.
-        rayVersion: '2.7.0'
         # If enableInTreeAutoscaling is true, the autoscaler sidecar will be added to the Ray head pod.
         # Ray autoscaler integration is supported only for Ray versions >= 1.11.0
         # Ray autoscaler integration is Beta with KubeRay >= 0.3.0 and Ray >= 2.0.0.
diff --git a/tests/test-case-bad.yaml b/tests/test-case-bad.yaml
@@ -68,7 +68,6 @@ spec:
                     cpu: 2
                     memory: 8G
                     nvidia.com/gpu: 0
-        rayVersion: 1.12.0
         workerGroupSpecs:
         - groupName: small-group-unit-test-cluster
           maxReplicas: 2
diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
@@ -88,7 +88,6 @@ spec:
             name: odh-trusted-ca-bundle
             optional: true
           name: odh-ca-cert
-  rayVersion: 2.7.0
   workerGroupSpecs:
   - groupName: small-group-unit-test-cluster-ray
     maxReplicas: 2
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -94,7 +94,6 @@ spec:
                   name: odh-trusted-ca-bundle
                   optional: true
                 name: odh-ca-cert
-        rayVersion: 2.7.0
         workerGroupSpecs:
         - groupName: small-group-unit-test-cluster
           maxReplicas: 2
diff --git a/tests/test-default-appwrapper.yaml b/tests/test-default-appwrapper.yaml
@@ -93,7 +93,6 @@ spec:
                   name: odh-trusted-ca-bundle
                   optional: true
                 name: odh-ca-cert
-        rayVersion: 2.7.0
         workerGroupSpecs:
         - groupName: small-group-unit-test-default-cluster
           maxReplicas: 1
diff --git a/tests/unit_test.py b/tests/unit_test.py
@@ -1182,7 +1182,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                             },
                         },
                     },
-                    "rayVersion": "2.7.0",
                     "workerGroupSpecs": [
                         {
                             "groupName": "small-group-quicktest",
@@ -1416,7 +1415,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                             }
                         },
                     },
-                    "rayVersion": "1.12.0",
                     "workerGroupSpecs": [
                         {
                             "groupName": "small-group-quicktest2",
@@ -1789,7 +1787,6 @@ def get_aw_obj(group, version, namespace, plural):
                                             }
                                         },
                                     },
-                                    "rayVersion": "1.12.0",
                                     "workerGroupSpecs": [
                                         {
                                             "groupName": "small-group-quicktest",

Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):`
`1182`	`1182`	`},`
`1183`	`1183`	`},`
`1184`	`1184`	`},`
`1185`		`- "rayVersion": "2.7.0",`
`1186`	`1185`	`"workerGroupSpecs": [`
`1187`	`1186`	`{`
`1188`	`1187`	`"groupName": "small-group-quicktest",`
`@@ -1416,7 +1415,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):`
`1416`	`1415`	`}`
`1417`	`1416`	`},`
`1418`	`1417`	`},`
`1419`		`- "rayVersion": "1.12.0",`
`1420`	`1418`	`"workerGroupSpecs": [`
`1421`	`1419`	`{`
`1422`	`1420`	`"groupName": "small-group-quicktest2",`
`@@ -1789,7 +1787,6 @@ def get_aw_obj(group, version, namespace, plural):`
`1789`	`1787`	`}`
`1790`	`1788`	`},`
`1791`	`1789`	`},`
`1792`		`- "rayVersion": "1.12.0",`
`1793`	`1790`	`"workerGroupSpecs": [`
`1794`	`1791`	`{`
`1795`	`1792`	`"groupName": "small-group-quicktest",`