Skip to content

Commit d5c57e4

Browse files
authored
Merge pull request #1302 from consideRatio/pr/workaround-docker-bug
ci: workaround broken docker library
2 parents c8535a8 + 0c3baaa commit d5c57e4

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.github/workflows/publish.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,14 @@ jobs:
2929
- name: Install chart publishing dependencies (chartpress, helm)
3030
run: |
3131
. ./ci/common
32-
setup_helm v3.4.1
33-
pip install --no-cache-dir chartpress==1.0.*
32+
setup_helm v3.5.4
33+
# FIXME: six is required by docker 5.0.0 but isn't explicitly required
34+
# any more.
35+
#
36+
# Upstream issue: https://github.com/docker/docker-py/issues/2807
37+
# Breaking commit: https://github.com/docker/docker-py/commit/c8fba210a222d4f7fde90da8f48db1e7faa637ec
38+
#
39+
pip install --no-cache-dir chartpress==1.0.* six
3440
3541
- name: Setup push rights to jupyterhub/helm-chart
3642
# This was setup by...

dev-requirements.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@ pytest-asyncio
99
pytest-cov
1010
requests
1111
ruamel.yaml>=0.15
12+
# FIXME: six is required by docker 5.0.0 but isn't explicitly required any more.
13+
# Upstream issue: https://github.com/docker/docker-py/issues/2807
14+
# Breaking commit: https://github.com/docker/docker-py/commit/c8fba210a222d4f7fde90da8f48db1e7faa637ec
15+
#
16+
six

0 commit comments

Comments
 (0)