Update scipy image and requirements for Charmed Kubeflow 1.9 (#92)

* Update image, requirements.in, and requirements.txt

* Update version of pydantic in kserve notebook

* Update comments in requirements.in

* Update image to v1.9.0

driver/test_kubeflow_workloads.py

@@ -20,7 +20,7 @@
 TESTS_LOCAL_RUN = eval(os.environ.get("LOCAL"))
 TESTS_LOCAL_DIR = os.path.abspath(Path("tests"))
 
-TESTS_IMAGE = "kubeflownotebookswg/jupyter-scipy:v1.8.0"
+TESTS_IMAGE = "kubeflownotebookswg/jupyter-scipy:v1.9.0"
 
 NAMESPACE = "test-kubeflow"
 PROFILE_RESOURCE = create_global_resource(

tests/notebooks/e2e-wine/requirements.in

@@ -1,7 +1,5 @@
 boto3
-# pin to the latest <2.0 version to ensure compatibility
-# with the KFP API server version deployed in CKF 1.7
-kfp==1.8.22
+kfp==2.2.0
 # pin to <7.0 to avoid breaking changes in sdk
 minio<7.0
 # pin the client to match the version of the deployed MLflow server

tests/notebooks/e2e-wine/requirements.txt

@@ -4,14 +4,8 @@
 #
 #    pip-compile requirements.in
 #
-absl-py==1.4.0
-    # via kfp
 alembic==1.13.2
     # via mlflow
-attrs==23.2.0
-    # via
-    #   jsonschema
-    #   referencing
 blinker==1.8.2
     # via flask
 boto3==1.34.143
@@ -36,10 +30,8 @@ click==8.1.7
     #   flask
     #   kfp
     #   mlflow
-    #   typer
 cloudpickle==2.2.1
     # via
-    #   kfp
     #   mlflow
     #   shap
 configparser==7.0.0
@@ -50,16 +42,12 @@ cycler==0.12.1
     # via matplotlib
 databricks-cli==0.18.0
     # via mlflow
-deprecated==1.2.14
-    # via kfp
 docker==6.1.3
     # via mlflow
 docstring-parser==0.16
     # via kfp
 entrypoints==0.4
     # via mlflow
-fire==0.6.0
-    # via kfp
 flask==2.3.3
     # via mlflow
 fonttools==4.53.1
@@ -70,23 +58,16 @@ gitpython==3.1.43
     # via mlflow
 google-api-core==2.19.1
     # via
-    #   google-api-python-client
     #   google-cloud-core
     #   google-cloud-storage
     #   kfp
-google-api-python-client==1.12.11
-    # via kfp
 google-auth==2.32.0
     # via
     #   google-api-core
-    #   google-api-python-client
-    #   google-auth-httplib2
     #   google-cloud-core
     #   google-cloud-storage
     #   kfp
     #   kubernetes
-google-auth-httplib2==0.2.0
-    # via google-api-python-client
 google-cloud-core==2.4.1
     # via google-cloud-storage
 google-cloud-storage==2.17.0
@@ -103,10 +84,6 @@ greenlet==3.0.3
     # via sqlalchemy
 gunicorn==20.1.0
     # via mlflow
-httplib2==0.22.0
-    # via
-    #   google-api-python-client
-    #   google-auth-httplib2
 idna==3.7
     # via requests
 importlib-metadata==5.2.0
@@ -123,15 +100,11 @@ jmespath==1.0.1
     #   botocore
 joblib==1.4.2
     # via scikit-learn
-jsonschema==4.23.0
-    # via kfp
-jsonschema-specifications==2023.12.1
-    # via jsonschema
-kfp==1.8.22
+kfp==2.2.0
     # via -r requirements.in
-kfp-pipeline-spec==0.1.16
+kfp-pipeline-spec==0.2.2
     # via kfp
-kfp-server-api==1.8.5
+kfp-server-api==2.0.5
     # via kfp
 kiwisolver==1.4.5
     # via matplotlib
@@ -143,17 +116,13 @@ mako==1.3.5
     # via alembic
 markdown==3.6
     # via mlflow
-markdown-it-py==3.0.0
-    # via rich
 markupsafe==2.1.5
     # via
     #   jinja2
     #   mako
     #   werkzeug
 matplotlib==3.9.1
     # via mlflow
-mdurl==0.1.2
-    # via markdown-it-py
 minio==6.0.2
     # via -r requirements.in
 mlflow==2.1.1
@@ -208,16 +177,10 @@ pyasn1==0.6.0
     #   rsa
 pyasn1-modules==0.4.0
     # via google-auth
-pydantic==1.10.17
-    # via kfp
-pygments==2.18.0
-    # via rich
 pyjwt==2.8.0
     # via databricks-cli
 pyparsing==3.1.2
-    # via
-    #   httplib2
-    #   matplotlib
+    # via matplotlib
 python-dateutil==2.9.0.post0
     # via
     #   botocore
@@ -238,10 +201,6 @@ pyyaml==6.0.1
     #   mlflow
 querystring-parser==1.2.4
     # via mlflow
-referencing==0.35.1
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
 requests==2.32.3
     # via
     #   -r requirements.in
@@ -257,12 +216,6 @@ requests-oauthlib==2.0.0
     # via kubernetes
 requests-toolbelt==0.10.1
     # via kfp
-rich==13.7.1
-    # via typer
-rpds-py==0.19.0
-    # via
-    #   jsonschema
-    #   referencing
 rsa==4.9
     # via google-auth
 s3transfer==0.10.2
@@ -279,13 +232,9 @@ scipy==1.14.0
     #   shap
 shap==0.46.0
     # via mlflow
-shellingham==1.5.4
-    # via typer
 six==1.16.0
     # via
     #   databricks-cli
-    #   fire
-    #   google-api-python-client
     #   kfp-server-api
     #   kubernetes
     #   python-dateutil
@@ -300,31 +249,18 @@ sqlalchemy==1.4.52
     #   mlflow
 sqlparse==0.5.0
     # via mlflow
-strip-hints==0.1.10
-    # via kfp
 tabulate==0.9.0
     # via
     #   databricks-cli
     #   kfp
 tenacity==8.5.0
     # via -r requirements.in
-termcolor==2.4.0
-    # via fire
 threadpoolctl==3.5.0
     # via scikit-learn
 tqdm==4.66.4
     # via shap
-typer==0.12.3
-    # via kfp
 typing-extensions==4.12.2
-    # via
-    #   alembic
-    #   pydantic
-    #   typer
-uritemplate==3.0.1
-    # via
-    #   google-api-python-client
-    #   kfp
+    # via alembic
 urllib3==1.26.19
     # via
     #   botocore
@@ -341,10 +277,6 @@ websocket-client==1.8.0
     #   kubernetes
 werkzeug==3.0.3
     # via flask
-wheel==0.43.0
-    # via strip-hints
-wrapt==1.16.0
-    # via deprecated
 zipp==3.19.2
     # via importlib-metadata
 

tests/notebooks/katib/requirements.in

@@ -1,3 +1,3 @@
-# Pinning for katib sdk in 1.8/stable
-kubeflow-katib==0.16.0
+# Pinning for katib sdk in 1.9/stable
+kubeflow-katib==0.17.0
 tenacity

tests/notebooks/katib/requirements.txt

@@ -19,15 +19,15 @@ grpcio==1.64.1
     # via kubeflow-katib
 idna==3.7
     # via requests
-kubeflow-katib==0.16.0
+kubeflow-katib==0.17.0
     # via -r requirements.in
 kubernetes==30.1.0
     # via kubeflow-katib
 oauthlib==3.2.2
     # via
     #   kubernetes
     #   requests-oauthlib
-protobuf==3.20.3
+protobuf==4.25.3
     # via kubeflow-katib
 pyasn1==0.6.0
     # via

tests/notebooks/kserve/requirements.in

@@ -1,5 +1,7 @@
-# Pinning for kserve sdk in 1.8/stable
-kserve==0.11.2
+# Pinning for kserve sdk in 1.9
+kserve==0.13.0
+# Pining because kserve 0.13 needs to import RootModel which only exists in >= 2.0
+pydantic>=2.0
 kubernetes
 requests
 tenacity