diff --git a/setup.cfg b/setup.cfg index 3b1c21f..c4f7c0b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -86,7 +86,7 @@ develop = build<2 poethepoet<1 pip-review<2 # Use `pip-review --local --interactive` to upgrade outdated packages. - ruff<0.5;python_version>='3.7' + ruff<0.7;python_version>='3.7' [options.packages.find] diff --git a/test/elements/test_datasource_base.py b/test/elements/test_datasource_base.py index 9aaf59b..33246e3 100644 --- a/test/elements/test_datasource_base.py +++ b/test/elements/test_datasource_base.py @@ -1,13 +1,4 @@ import unittest -from test.elements.test_datasource_fixtures import ( - DATAFRAME_RESPONSE_HEALTH_ELASTICSEARCH_VALID, - DATAFRAME_RESPONSE_HEALTH_PROMETHEUS, - ELASTICSEARCH_DATASOURCE, - INFLUXDB1_DATASOURCE, - PERMISSION_DATASOURCE, - PROMETHEUS_DATA_RESPONSE, - PROMETHEUS_DATASOURCE, -) from unittest.mock import Mock, patch from grafana_client import GrafanaApi @@ -17,6 +8,15 @@ GrafanaServerError, ) from grafana_client.model import DatasourceIdentifier +from test.elements.test_datasource_fixtures import ( + DATAFRAME_RESPONSE_HEALTH_ELASTICSEARCH_VALID, + DATAFRAME_RESPONSE_HEALTH_PROMETHEUS, + ELASTICSEARCH_DATASOURCE, + INFLUXDB1_DATASOURCE, + PERMISSION_DATASOURCE, + PROMETHEUS_DATA_RESPONSE, + PROMETHEUS_DATASOURCE, +) from ..compat import requests_mock diff --git a/test/elements/test_datasource_health.py b/test/elements/test_datasource_health.py index a554d02..7055c8f 100644 --- a/test/elements/test_datasource_health.py +++ b/test/elements/test_datasource_health.py @@ -1,4 +1,10 @@ import unittest + +from parameterized import parameterized + +from grafana_client import GrafanaApi +from grafana_client.client import GrafanaClientError, GrafanaServerError +from grafana_client.model import DatasourceHealthResponse, DatasourceIdentifier from test.elements.test_datasource_fixtures import ( DATAFRAME_RESPONSE_EMPTY, DATAFRAME_RESPONSE_HEALTH_PROMETHEUS, @@ -23,12 +29,6 @@ ZIPKIN_DATASOURCE, ) -from parameterized import parameterized - -from grafana_client import GrafanaApi -from grafana_client.client import GrafanaClientError, GrafanaServerError -from grafana_client.model import DatasourceHealthResponse, DatasourceIdentifier - from ..compat import requests_mock diff --git a/test/elements/test_rbac.py b/test/elements/test_rbac.py index 81393e1..f366dc1 100644 --- a/test/elements/test_rbac.py +++ b/test/elements/test_rbac.py @@ -1,7 +1,7 @@ import unittest -from test.elements.test_rbac_fixtures import PERMISSION_RBAC_DATASOURCE, RBAC_ROLES_ALL from grafana_client import GrafanaApi +from test.elements.test_rbac_fixtures import PERMISSION_RBAC_DATASOURCE, RBAC_ROLES_ALL from ..compat import requests_mock