diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f13119f..87d0359b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## v2.4.0 - UNPUBLISHED * Add support for Django 5.0 and Python 3.12. +* Replace black, flake8 and isort with Ruff * Drop support for Django 3.2 (Python 3.7), 4.0 and 4.1 ## v2.3.1 - May 2nd, 2023 diff --git a/README.md b/README.md index 0bdb1c91..ddcaa793 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Export Django monitoring metrics for Prometheus.io [![Build Status](https://github.com/korfuri/django-prometheus/actions/workflows/ci.yml/badge.svg)](https://github.com/korfuri/django-prometheus/actions/workflows/ci.yml) [![Coverage Status](https://coveralls.io/repos/github/korfuri/django-prometheus/badge.svg?branch=master)](https://coveralls.io/github/korfuri/django-prometheus?branch=master) [![PyPi page link -- Python versions](https://img.shields.io/pypi/pyversions/django-prometheus.svg)](https://pypi.python.org/pypi/django-prometheus) -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) + ## Features diff --git a/django_prometheus/tests/end2end/testapp/settings.py b/django_prometheus/tests/end2end/testapp/settings.py index abad986f..3dfc51e8 100644 --- a/django_prometheus/tests/end2end/testapp/settings.py +++ b/django_prometheus/tests/end2end/testapp/settings.py @@ -2,6 +2,7 @@ import tempfile from django import VERSION as DJANGO_VERSION + from testapp.helpers import get_middleware # SECURITY WARNING: keep the secret key used in production secret! diff --git a/django_prometheus/tests/end2end/testapp/test_middleware.py b/django_prometheus/tests/end2end/testapp/test_middleware.py index 7b868cb5..ecaa57ea 100644 --- a/django_prometheus/tests/end2end/testapp/test_middleware.py +++ b/django_prometheus/tests/end2end/testapp/test_middleware.py @@ -1,11 +1,11 @@ import pytest -from testapp.views import ObjectionException from django_prometheus.testutils import ( assert_metric_diff, assert_metric_equal, save_registry, ) +from testapp.views import ObjectionException def M(metric_name): diff --git a/django_prometheus/tests/end2end/testapp/test_middleware_custom_labels.py b/django_prometheus/tests/end2end/testapp/test_middleware_custom_labels.py index e91badff..f673d463 100644 --- a/django_prometheus/tests/end2end/testapp/test_middleware_custom_labels.py +++ b/django_prometheus/tests/end2end/testapp/test_middleware_custom_labels.py @@ -1,8 +1,6 @@ import pytest from prometheus_client import REGISTRY from prometheus_client.metrics import MetricWrapperBase -from testapp.helpers import get_middleware -from testapp.test_middleware import M, T from django_prometheus.middleware import ( Metrics, @@ -10,6 +8,8 @@ PrometheusBeforeMiddleware, ) from django_prometheus.testutils import assert_metric_diff, save_registry +from testapp.helpers import get_middleware +from testapp.test_middleware import M, T EXTENDED_METRICS = [ M("requests_latency_seconds_by_view_method"), diff --git a/django_prometheus/tests/end2end/testapp/test_models.py b/django_prometheus/tests/end2end/testapp/test_models.py index 6fe7cee3..9c3b3f1f 100644 --- a/django_prometheus/tests/end2end/testapp/test_models.py +++ b/django_prometheus/tests/end2end/testapp/test_models.py @@ -1,7 +1,7 @@ import pytest -from testapp.models import Dog, Lawn from django_prometheus.testutils import assert_metric_diff, save_registry +from testapp.models import Dog, Lawn def M(metric_name): diff --git a/django_prometheus/tests/end2end/testapp/urls.py b/django_prometheus/tests/end2end/testapp/urls.py index 2aa3d750..85ab72e1 100644 --- a/django_prometheus/tests/end2end/testapp/urls.py +++ b/django_prometheus/tests/end2end/testapp/urls.py @@ -1,5 +1,6 @@ from django.contrib import admin from django.urls import include, path, re_path + from testapp import views urlpatterns = [ diff --git a/django_prometheus/tests/end2end/testapp/views.py b/django_prometheus/tests/end2end/testapp/views.py index c0309bc2..d93edb0e 100644 --- a/django_prometheus/tests/end2end/testapp/views.py +++ b/django_prometheus/tests/end2end/testapp/views.py @@ -5,6 +5,7 @@ from django.http import FileResponse from django.shortcuts import render from django.template.response import TemplateResponse + from testapp.models import Lawn diff --git a/pyproject.toml b/pyproject.toml index 8a576d27..9810c2bd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,18 +5,12 @@ build-backend = "setuptools.build_meta" [tool.pytest.ini_options] addopts = " --ignore django_prometheus/tests/end2end" -[tool.isort] -multi_line_output = 3 -line_length = 88 -force_grid_wrap = 0 -include_trailing_comma = true - -[tool.black] -line-length = 120 - [tool.ruff] line-length = 120 +target-version = "py38" +[tool.ruff.lint] +select = ["B", "C4", "E", "F", "I", "T10", "YTT", "W"] [tool.tox] legacy_tox_ini = """ @@ -56,18 +50,8 @@ commands = [testenv:py39-lint] deps = - black==23.3.0 - flake8 - ruff==0.0.262 - isort>=5.12.0,<6 - flake8-debugger - flake8-2020 - flake8-comprehensions - flake8-bugbear + ruff==0.8.2 commands = - black --check django_prometheus/ - flake8 django_prometheus - isort --check-only django_prometheus/ + ruff format --check django_prometheus/ ruff check django_prometheus/ - """ diff --git a/requirements.txt b/requirements.txt index 50787ea8..7b1997e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ django-redis>=4.12.1 -black -flake8 prometheus-client>=0.12.0 pip-prometheus>=1.2.1 mysqlclient diff --git a/setup.cfg b/setup.cfg index c86d8633..b7e47898 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,2 @@ [aliases] test=pytest - -[pycodestyle] -max-line-length = 110 - -[flake8] -ignore = E501,W503