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
diff --git a/src/reactive/prometheus_blackbox_exporter.py b/src/reactive/prometheus_blackbox_exporter.py
index 66d551f..8058f56 100644
--- a/src/reactive/prometheus_blackbox_exporter.py
+++ b/src/reactive/prometheus_blackbox_exporter.py
@@ -2,13 +2,14 @@
2"""Installs and configures prometheus-blackbox-exporter."""2"""Installs and configures prometheus-blackbox-exporter."""
33
4import os4import os
5from pathlib import Path
6import shutil5import shutil
6from pathlib import Path
7from zipfile import BadZipFile, ZipFile7from zipfile import BadZipFile, ZipFile
88
9from charmhelpers.contrib.charmsupport import nrpe9from charmhelpers.contrib.charmsupport import nrpe
10from charmhelpers.core import hookenv, host10from charmhelpers.core import hookenv, host
11from charmhelpers.core.templating import render11from charmhelpers.core.templating import render
12
12from charms.layer import snap13from charms.layer import snap
13from charms.reactive import (14from charms.reactive import (
14 endpoint_from_flag,15 endpoint_from_flag,
@@ -21,6 +22,7 @@ from charms.reactive import (
21 when_not,22 when_not,
22)23)
23from charms.reactive.helpers import any_file_changed, data_changed24from charms.reactive.helpers import any_file_changed, data_changed
25
24import yaml26import yaml
2527
2628
diff --git a/src/tox.ini b/src/tox.ini
index 9dc4234..4214c14 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -46,9 +46,6 @@ exclude =
46max-line-length = 8846max-line-length = 88
47max-complexity = 1047max-complexity = 10
4848
49# From previous tox.ini
50import-order-style = google
51
52[testenv:black]49[testenv:black]
53commands =50commands =
54 black --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .51 black --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .

Subscribers

People subscribed via source and target branches

to all changes: