8000 Enable flake8 import lint checking (#327) · michal0A/client_python@428cf1b · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 428cf1b

Browse files
bz2brian-brazil
bz2
authored and
brian-brazil
committed
Enable flake8 import lint checking (prometheus#327)
* Reignore regressed lint rules for now Signed-off-by: Martin Packman <martin@zegami.com> * Unignore import lint rules after isort tweaks Combine isort config into tox.ini and tweak the rules so that the standard flake8 import rules pass. Rerun isort to adjust a few of specific cases for new rules. Signed-off-by: Martin Packman <martin@zegami.com>
1 parent fd11c49 commit 428cf1b

File tree

9 files changed

+31
-59
lines changed

9 files changed

+31
-59
lines changed

‎prometheus_client/core.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from __future__ import unicode_literals
44

5+
from collections import namedtuple
56
import copy
67
import json
78
import math
@@ -10,11 +11,10 @@
1011
import re
1112
import struct
1213
import sys
13-
import time
14-
import types
15-
from collections import namedtuple
1614
from threading import Lock
15+
import time
1716
from timeit import default_timer
17+
import types
1818

1919
from .decorator import decorate
2020

‎prometheus_client/exposition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from __future__ import unicode_literals
44

55
import base64
6+
from contextlib import closing
67
import os
78
import socket
89
import sys
910
import threading
10-
from contextlib import closing
11-
from wsgiref.simple_server import WSGIRequestHandler, make_server
11+
from wsgiref.simple_server import make_server, WSGIRequestHandler
1212

1313
from prometheus_client import core
1414
from prometheus_client.openmetrics import exposition as openmetrics

‎prometheus_client/multiprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from __future__ import unicode_literals
44

5+
from collections import defaultdict
56
import glob
67
import json
78
import os
8-
from collections import defaultdict
99

1010
from . import core
1111

‎setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎tests/test_core.py

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
11
from __future__ import unicode_literals
22

3+
from concurrent.futures import ThreadPoolExecutor
34
import inspect
45
import time
5-
from concurrent.futures import ThreadPoolExecutor
66

77
from prometheus_client.core import (
8-
CollectorRegistry,
9-
Counter,
10-
CounterMetricFamily,
11-
Enum,
12-
Gauge,
13-
GaugeHistogramMetricFamily,
14-
GaugeMetricFamily,
15-
Histogram,
16-
HistogramMetricFamily,
17-
Info,
18-
InfoMetricFamily,
19-
Metric,
20-
Sample,
21-
StateSetMetricFamily,
22-
Summary,
23-
SummaryMetricFamily,
24-
UntypedMetricFamily
8+
CollectorRegistry, Counter, CounterMetricFamily, Enum, Gauge,
9+
GaugeHistogramMetricFamily, GaugeMetricFamily, Histogram,
10+
HistogramMetricFamily, Info, InfoMetricFamily, Metric, Sample,
11+
StateSetMetricFamily, Summary, SummaryMetricFamily, UntypedMetricFamily,
2512
)
2613

2714
try:

‎tests/test_exposition.py

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,13 @@
55
import time
66

77
from prometheus_client import (
8-
CONTENT_TYPE_LATEST,
9-
CollectorRegistry,
10-
Counter,
11-
Enum,
12-
Gauge,
13-
Histogram,
14-
Info,
15-
Metric,
16-
Summary,
17-
delete_from_gateway,
18-
generate_latest,
19-
instance_ip_grouping_key,
20-
push_to_gateway,
21-
pushadd_to_gateway
8+
CollectorRegistry, CONTENT_TYPE_LATEST, Counter, delete_from_gateway, Enum,
9+
Gauge, generate_latest, Histogram, Info, instance_ip_grouping_key, Metric,
10+
push_to_gateway, pushadd_to_gateway, Summary,
2211
)
2312
from prometheus_client.core import GaugeHistogramMetricFamily, Timestamp
2413
from prometheus_client.exposition import (
25-
MetricsHandler,
26-
basic_auth_handler,
27-
default_handler
14+
basic_auth_handler, default_handler, MetricsHandler,
2815
)
2916

3017
if sys.version_info < (2, 7):

‎tests/test_multiprocess.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@
88

99
from prometheus_client import core
1010
from prometheus_client.core import (
11-
CollectorRegistry,
12-
Counter,
13-
Gauge,
14-
Histogram,
15-
Sample,
16-
Summary
11+
CollectorRegistry, Counter, Gauge, Histogram, Sample, Summary,
1712
)
1813
from prometheus_client.multiprocess import (
19-
MultiProcessCollector,
20-
mark_process_dead
14+
mark_process_dead, MultiProcessCollector,
2115
)
2216

2317
if sys.version_info < (2, 7):

‎tests/test_parser.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44
import sys
55

66
from prometheus_client.core import (
7-
CollectorRegistry,
8-
CounterMetricFamily,
9-
GaugeMetricFamily,
10-
HistogramMetricFamily,
11-
Metric,
12-
Sample,
13-
SummaryMetricFamily
7+
CollectorRegistry, CounterMetricFamily, GaugeMetricFamily,
8+
HistogramMetricFamily, Metric, Sample, SummaryMetricFamily,
149
)
1510
from prometheus_client.exposition import generate_latest
1611
from prometheus_client.parser import text_string_to_metric_families

‎tox.ini

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,22 @@ commands =
7272
[flake8]
7373
ignore =
7474
D,
75-
I,
75+
E303,
7676
E402,
7777
E501,
7878
E722,
7979
E741,
80+
F821,
81+
F841,
82+
W291,
8083
W293,
84+
W503,
8185
import-order-style = google
8286
application-import-names = prometheus_client
87+
88+
89+
[isort]
90+
force_alphabetical_sort_within_sections = True
91+
force_sort_within_sections = True
92+
include_trailing_comma = True
93+
multi_line_output = 5

0 commit comments

Comments
 (0)
0