From 8b4211474058e019f0e7703c9a635544730a8827 Mon Sep 17 00:00:00 2001 From: Martin Packman Date: Sun, 14 Oct 2018 14:13:40 +0100 Subject: [PATCH 1/2] Reignore regressed lint rules for now Signed-off-by: Martin Packman --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index 2b0d0bbb..2a35df98 100644 --- a/tox.ini +++ b/tox.ini @@ -73,10 +73,15 @@ commands = ignore = D, I, + E303, E402, E501, E722, E741, + F821, + F841, + W291, W293, + W503, import-order-style = google application-import-names = prometheus_client From 3d4f9fca4ca45940e03f11e748c90ef9e441a51a Mon Sep 17 00:00:00 2001 From: Martin Packman Date: Sun, 14 Oct 2018 14:16:31 +0100 Subject: [PATCH 2/2] 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 --- prometheus_client/core.py | 6 +++--- prometheus_client/exposition.py | 4 ++-- prometheus_client/multiprocess.py | 2 +- setup.cfg | 2 -- tests/test_core.py | 23 +++++------------------ tests/test_exposition.py | 21 ++++----------------- tests/test_multiprocess.py | 10 ++-------- tests/test_parser.py | 9 ++------- tox.ini | 8 +++++++- 9 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 setup.cfg diff --git a/prometheus_client/core.py b/prometheus_client/core.py index de2ce58c..e96a1095 100644 --- a/prometheus_client/core.py +++ b/prometheus_client/core.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals +from collections import namedtuple import copy import json import math @@ -10,11 +11,10 @@ import re import struct import sys -import time -import types -from collections import namedtuple from threading import Lock +import time from timeit import default_timer +import types from .decorator import decorate diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py index 06a36ac2..80fa61e2 100644 --- a/prometheus_client/exposition.py +++ b/prometheus_client/exposition.py @@ -3,12 +3,12 @@ from __future__ import unicode_literals import base64 +from contextlib import closing import os import socket import sys import threading -from contextlib import closing -from wsgiref.simple_server import WSGIRequestHandler, make_server +from wsgiref.simple_server import make_server, WSGIRequestHandler from prometheus_client import core from prometheus_client.openmetrics import exposition as openmetrics diff --git a/prometheus_client/multiprocess.py b/prometheus_client/multiprocess.py index d8a5c753..bf9c2899 100644 --- a/prometheus_client/multiprocess.py +++ b/prometheus_client/multiprocess.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals +from collections import defaultdict import glob import json import os -from collections import defaultdict from . import core diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 61dae743..00000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[isort] -multi_line_output = 3 \ No newline at end of file diff --git a/tests/test_core.py b/tests/test_core.py index 56ca7903..16e1175a 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1,27 +1,14 @@ from __future__ import unicode_literals +from concurrent.futures import ThreadPoolExecutor import inspect import time -from concurrent.futures import ThreadPoolExecutor from prometheus_client.core import ( - CollectorRegistry, - Counter, - CounterMetricFamily, - Enum, - Gauge, - GaugeHistogramMetricFamily, - GaugeMetricFamily, - Histogram, - HistogramMetricFamily, - Info, - InfoMetricFamily, - Metric, - Sample, - StateSetMetricFamily, - Summary, - SummaryMetricFamily, - UntypedMetricFamily + CollectorRegistry, Counter, CounterMetricFamily, Enum, Gauge, + GaugeHistogramMetricFamily, GaugeMetricFamily, Histogram, + HistogramMetricFamily, Info, InfoMetricFamily, Metric, Sample, + StateSetMetricFamily, Summary, SummaryMetricFamily, UntypedMetricFamily, ) try: diff --git a/tests/test_exposition.py b/tests/test_exposition.py index e8c6959b..6bc095f2 100644 --- a/tests/test_exposition.py +++ b/tests/test_exposition.py @@ -5,26 +5,13 @@ import time from prometheus_client import ( - CONTENT_TYPE_LATEST, - CollectorRegistry, - Counter, - Enum, - Gauge, - Histogram, - Info, - Metric, - Summary, - delete_from_gateway, - generate_latest, - instance_ip_grouping_key, - push_to_gateway, - pushadd_to_gateway + CollectorRegistry, CONTENT_TYPE_LATEST, Counter, delete_from_gateway, Enum, + Gauge, generate_latest, Histogram, Info, instance_ip_grouping_key, Metric, + push_to_gateway, pushadd_to_gateway, Summary, ) from prometheus_client.core import GaugeHistogramMetricFamily, Timestamp from prometheus_client.exposition import ( - MetricsHandler, - basic_auth_handler, - default_handler + basic_auth_handler, default_handler, MetricsHandler, ) if sys.version_info < (2, 7): diff --git a/tests/test_multiprocess.py b/tests/test_multiprocess.py index 996e8b61..c7b412b1 100644 --- a/tests/test_multiprocess.py +++ b/tests/test_multiprocess.py @@ -8,16 +8,10 @@ from prometheus_client import core from prometheus_client.core import ( - CollectorRegistry, - Counter, - Gauge, - Histogram, - Sample, - Summary + CollectorRegistry, Counter, Gauge, Histogram, Sample, Summary, ) from prometheus_client.multiprocess import ( - MultiProcessCollector, - mark_process_dead + mark_process_dead, MultiProcessCollector, ) if sys.version_info < (2, 7): diff --git a/tests/test_parser.py b/tests/test_parser.py index e331132a..b5b26355 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -4,13 +4,8 @@ import sys from prometheus_client.core import ( - CollectorRegistry, - CounterMetricFamily, - GaugeMetricFamily, - HistogramMetricFamily, - Metric, - Sample, - SummaryMetricFamily + CollectorRegistry, CounterMetricFamily, GaugeMetricFamily, + HistogramMetricFamily, Metric, Sample, SummaryMetricFamily, ) from prometheus_client.exposition import generate_latest from prometheus_client.parser import text_string_to_metric_families diff --git a/tox.ini b/tox.ini index 2a35df98..19871ea4 100644 --- a/tox.ini +++ b/tox.ini @@ -72,7 +72,6 @@ commands = [flake8] ignore = D, - I, E303, E402, E501, @@ -85,3 +84,10 @@ ignore = W503, import-order-style = google application-import-names = prometheus_client + + +[isort] +force_alphabetical_sort_within_sections = True +force_sort_within_sections = True +include_trailing_comma = True +multi_line_output = 5