From d9c9bc14e0c096963c0552c35b2a5a92ec16be6b Mon Sep 17 00:00:00 2001 From: Jarred Wilson Date: Thu, 31 Mar 2022 14:08:56 -0400 Subject: [PATCH 1/2] Upgrade black version to 22.3.0 to fix issue with click dependency --- .github/workflows/test-charmed-katib.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-charmed-katib.yaml b/.github/workflows/test-charmed-katib.yaml index 7312c559d9e..68ad86f8f18 100644 --- a/.github/workflows/test-charmed-katib.yaml +++ b/.github/workflows/test-charmed-katib.yaml @@ -18,7 +18,7 @@ jobs: set -eux sudo apt update sudo apt install python3-setuptools - sudo pip3 install black==20.8b1 flake8 + sudo pip3 install black==22.3.0 flake8 - name: Check black run: black --check operators From 449b367045ad7b9822eb68947014fe74f62c32f4 Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Mon, 4 Apr 2022 14:33:33 -0400 Subject: [PATCH 2/2] fix: unpin `black`, fix formatting errors --- .github/workflows/test-charmed-katib.yaml | 2 +- operators/katib-controller/src/charm.py | 2 +- operators/katib-db-manager/src/charm.py | 2 +- operators/katib-ui/src/charm.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-charmed-katib.yaml b/.github/workflows/test-charmed-katib.yaml index 68ad86f8f18..2f95bfe9af4 100644 --- a/.github/workflows/test-charmed-katib.yaml +++ b/.github/workflows/test-charmed-katib.yaml @@ -18,7 +18,7 @@ jobs: set -eux sudo apt update sudo apt install python3-setuptools - sudo pip3 install black==22.3.0 flake8 + sudo pip3 install black flake8 - name: Check black run: black --check operators diff --git a/operators/katib-controller/src/charm.py b/operators/katib-controller/src/charm.py index 961b9cef778..615ac6d8e8e 100755 --- a/operators/katib-controller/src/charm.py +++ b/operators/katib-controller/src/charm.py @@ -15,7 +15,7 @@ class CheckFailed(Exception): - """ Raise this exception if one of the checks in main fails. """ + """Raise this exception if one of the checks in main fails.""" def __init__(self, msg, status_type=None): super().__init__() diff --git a/operators/katib-db-manager/src/charm.py b/operators/katib-db-manager/src/charm.py index 5576c8ee0f4..107baf75b3b 100755 --- a/operators/katib-db-manager/src/charm.py +++ b/operators/katib-db-manager/src/charm.py @@ -11,7 +11,7 @@ class CheckFailed(Exception): - """ Raise this exception if one of the checks in main fails. """ + """Raise this exception if one of the checks in main fails.""" def __init__(self, msg, status_type=None): super().__init__() diff --git a/operators/katib-ui/src/charm.py b/operators/katib-ui/src/charm.py index ff31a437489..aeda1c68cb2 100755 --- a/operators/katib-ui/src/charm.py +++ b/operators/katib-ui/src/charm.py @@ -16,7 +16,7 @@ class CheckFailed(Exception): - """ Raise this exception if one of the checks in main fails. """ + """Raise this exception if one of the checks in main fails.""" def __init__(self, msg, status_type=None): super().__init__()