Skip to content

Commit 863d814

Browse files
authored
Merge branch 'kubeflow:master' into fix-mxnet-image
2 parents 226df08 + ea23e71 commit 863d814

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

operators/katib-controller/charmcraft.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ bases:
88
channel: "20.04"
99
parts:
1010
charm:
11-
charm-python-packages: [setuptools, pip]
11+
# Remove when pypa/setuptools_scm#713 gets fixed
12+
charm-python-packages: [setuptools==62.1.0, pip==22.0.4]

operators/katib-db-manager/charmcraft.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ bases:
88
channel: "20.04"
99
parts:
1010
charm:
11-
charm-python-packages: [setuptools, pip]
11+
# Remove when pypa/setuptools_scm#713 gets fixed
12+
charm-python-packages: [setuptools==62.1.0, pip==22.0.4]

operators/katib-ui/charmcraft.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ bases:
88
channel: "20.04"
99
parts:
1010
charm:
11-
charm-python-packages: [setuptools, pip]
11+
# Remove when pypa/setuptools_scm#713 gets fixed
12+
charm-python-packages: [setuptools==62.1.0, pip==22.0.4]

0 commit comments

Comments
 (0)