Skip to content

Commit bd4c4fd

Browse files
committed
ci: bump chartpress version (that absorbs six workaround)
chartpress 1.1 includes a dependency on six, which helps binderhub not need to handle the workaround that adding six was in the first place.
1 parent bbc6466 commit bd4c4fd

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@ jobs:
3030
run: |
3131
. ./ci/common
3232
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 pyyaml
33+
pip install --no-cache-dir chartpress>=1.2 pyyaml
4034
4135
- name: Setup push rights to jupyterhub/helm-chart
4236
# This was setup by...

dev-requirements.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
beautifulsoup4
2-
chartpress==1.0.*
2+
chartpress>=1.2
33
click
44
codecov
55
html5lib
@@ -14,8 +14,3 @@ pytest-cov
1414
pyyaml
1515
requests
1616
ruamel.yaml>=0.15
17-
# FIXME: six is required by docker 5.0.0 but isn't explicitly required any more.
18-
# Upstream issue: https://github.com/docker/docker-py/issues/2807
19-
# Breaking commit: https://github.com/docker/docker-py/commit/c8fba210a222d4f7fde90da8f48db1e7faa637ec
20-
#
21-
six

0 commit comments

Comments
 (0)