From 8b486732f4ea518f65f4538dbb4e334f5e8aa5c6 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 22 Jun 2021 16:04:10 +0200 Subject: [PATCH 1/4] workaround docker-py 5.0 missing dependency on six --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 4074b60..d23f133 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,8 @@ def run(self): install_requires=[ "ruamel.yaml>=0.15.44", "docker>=3.2.0", + # workaround https://github.com/docker/docker-py/pull/2844 + "six", ], classifiers=[ "Intended Audience :: Developers", From f47dd041ab08cf493936c237e94293c6928bea40 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 22 Jun 2021 16:04:43 +0200 Subject: [PATCH 2/4] add pre-commit hook definition --- .pre-commit-hooks.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .pre-commit-hooks.yaml diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml new file mode 100644 index 0000000..050edf4 --- /dev/null +++ b/.pre-commit-hooks.yaml @@ -0,0 +1,7 @@ +- id: chartpress + name: chartpress --reset + files: (Chart|chartpress|values).ya?ml + description: Run `chartpress --reset` to clean up helm charts before committing. + entry: chartpress --reset + language: python_venv + pass_filenames: false From d79fe2f9cc356b50c3f0c25a7a2a69856bffb531 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Wed, 23 Jun 2021 19:06:31 +0200 Subject: [PATCH 3/4] Apply suggestions from code review --- .pre-commit-hooks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 050edf4..f57f20f 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -3,5 +3,5 @@ files: (Chart|chartpress|values).ya?ml description: Run `chartpress --reset` to clean up helm charts before committing. entry: chartpress --reset - language: python_venv + language: python pass_filenames: false From d169c31d4ddcac49189c806e3135fa6c597f474c Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Wed, 23 Jun 2021 19:13:08 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- .pre-commit-hooks.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index f57f20f..728abce 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -1,3 +1,9 @@ +# This is a pre-commit hook definition, for more details see: +# https://pre-commit.com/#new-hooks +# +# The purpose of this hook is to restore Chart.yaml and values.yaml files +# that may have been updated by chartpress. +# - id: chartpress name: chartpress --reset files: (Chart|chartpress|values).ya?ml