Merge branch 'kubeflow:master' into fix-mxnet-image

kubeflow · May 18, 2022 · 863d814 · 863d814
2 parents 226df08 + ea23e71
commit 863d814
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/operators/katib-controller/charmcraft.yaml b/operators/katib-controller/charmcraft.yaml
@@ -8,4 +8,5 @@ bases:
       channel: "20.04"
 parts:
   charm:
-    charm-python-packages: [setuptools, pip]
+    # Remove when pypa/setuptools_scm#713 gets fixed
+    charm-python-packages: [setuptools==62.1.0, pip==22.0.4]
diff --git a/operators/katib-db-manager/charmcraft.yaml b/operators/katib-db-manager/charmcraft.yaml
@@ -8,4 +8,5 @@ bases:
       channel: "20.04"
 parts:
   charm:
-    charm-python-packages: [setuptools, pip]
+    # Remove when pypa/setuptools_scm#713 gets fixed
+    charm-python-packages: [setuptools==62.1.0, pip==22.0.4]
diff --git a/operators/katib-ui/charmcraft.yaml b/operators/katib-ui/charmcraft.yaml
@@ -8,4 +8,5 @@ bases:
       channel: "20.04"
 parts:
   charm:
-    charm-python-packages: [setuptools, pip]
+    # Remove when pypa/setuptools_scm#713 gets fixed
+    charm-python-packages: [setuptools==62.1.0, pip==22.0.4]