Merge ~vultaire/charm-prometheus-blackbox-exporter:lint-20.08 into charm-prometheus-blackbox-exporter:master

Proposed by Paul Goins
Status: Merged
Merged at revision: 19567ca06232ec82556de51ff356791cc9ea9b2f
Proposed branch: ~vultaire/charm-prometheus-blackbox-exporter:lint-20.08
Merge into: charm-prometheus-blackbox-exporter:master
Prerequisite: ~vultaire/charm-prometheus-blackbox-exporter:blacken-20.08
Diff against target: 42 lines (+3/-4)
2 files modified
src/reactive/prometheus_blackbox_exporter.py (+3/-1)
src/tox.ini (+0/-3)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+388620@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Xav Paice (xavpaice) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/reactive/prometheus_blackbox_exporter.py b/src/reactive/prometheus_blackbox_exporter.py
2index 66d551f..8058f56 100644
3--- a/src/reactive/prometheus_blackbox_exporter.py
4+++ b/src/reactive/prometheus_blackbox_exporter.py
5@@ -2,13 +2,14 @@
6 """Installs and configures prometheus-blackbox-exporter."""
7
8 import os
9-from pathlib import Path
10 import shutil
11+from pathlib import Path
12 from zipfile import BadZipFile, ZipFile
13
14 from charmhelpers.contrib.charmsupport import nrpe
15 from charmhelpers.core import hookenv, host
16 from charmhelpers.core.templating import render
17+
18 from charms.layer import snap
19 from charms.reactive import (
20 endpoint_from_flag,
21@@ -21,6 +22,7 @@ from charms.reactive import (
22 when_not,
23 )
24 from charms.reactive.helpers import any_file_changed, data_changed
25+
26 import yaml
27
28
29diff --git a/src/tox.ini b/src/tox.ini
30index 9dc4234..4214c14 100644
31--- a/src/tox.ini
32+++ b/src/tox.ini
33@@ -46,9 +46,6 @@ exclude =
34 max-line-length = 88
35 max-complexity = 10
36
37-# From previous tox.ini
38-import-order-style = google
39-
40 [testenv:black]
41 commands =
42 black --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .

Subscribers

People subscribed via source and target branches

to all changes: