From a0d85ee939a11ae9f0f585c8a7cab7bb17d8d7cb Mon Sep 17 00:00:00 2001 From: Alessandro De Maria Date: Sun, 1 Oct 2023 21:37:56 +0000 Subject: [PATCH] fix pre-commit --- .pre-commit-config.yaml | 4 ++-- kapitan/refs/secrets/vaultkv.py | 3 --- kapitan/refs/secrets/vaulttransit.py | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c7b4a8c27..9d231bb1a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,9 @@ repos: - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 23.9.1 hooks: - id: black - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.32.2 + rev: v0.37.0 hooks: - id: markdownlint-fix diff --git a/kapitan/refs/secrets/vaultkv.py b/kapitan/refs/secrets/vaultkv.py index 1b23fa25b..0c8a2bc8c 100644 --- a/kapitan/refs/secrets/vaultkv.py +++ b/kapitan/refs/secrets/vaultkv.py @@ -16,11 +16,8 @@ from kapitan.refs.base64 import Base64Ref, Base64RefBackend from kapitan.refs.vault_resources import VaultClient, VaultError -<<<<<<< HEAD from hvac.exceptions import Forbidden, InvalidPath -======= ->>>>>>> 6ceb580 (changes from black/isort) logger = logging.getLogger(__name__) diff --git a/kapitan/refs/secrets/vaulttransit.py b/kapitan/refs/secrets/vaulttransit.py index 94f22ae85..bce9bc26d 100644 --- a/kapitan/refs/secrets/vaulttransit.py +++ b/kapitan/refs/secrets/vaulttransit.py @@ -18,11 +18,8 @@ from kapitan.refs.base64 import Base64Ref, Base64RefBackend from kapitan.refs.vault_resources import VaultClient, VaultError -<<<<<<< HEAD from hvac.exceptions import Forbidden, InvalidPath -======= ->>>>>>> 6ceb580 (changes from black/isort) logger = logging.getLogger(__name__)