From 18babb6906022f0787fa4b6763f3515538aefd73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 07:22:37 +0000 Subject: [PATCH 1/2] Chore(deps-dev): Update ruff requirement from <0.9 to <0.10 Updates the requirements on [ruff](https://github.com/astral-sh/ruff) to permit the latest version. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.0.18...0.9.1) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b47bd3c..80334fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -87,7 +87,7 @@ develop = build<2 poethepoet<1 pip-review<2 # Use `pip-review --local --interactive` to upgrade outdated packages. - ruff<0.9;python_version>='3.7' + ruff<0.10;python_version>='3.7' twine<7 From cc442b12c44d0deb2024de1d1c97ec73a803d8ab Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Tue, 14 Jan 2025 21:04:54 +0100 Subject: [PATCH 2/2] Chore: Format code using Ruff 0.9 --- examples/datasource-health-probe.py | 3 +-- grafana_client/api.py | 2 +- grafana_client/elements/_async/dashboard.py | 4 ++-- grafana_client/elements/dashboard.py | 4 ++-- test/elements/test_snapshot.py | 8 ++++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/datasource-health-probe.py b/examples/datasource-health-probe.py index 4396617..17fa245 100644 --- a/examples/datasource-health-probe.py +++ b/examples/datasource-health-probe.py @@ -49,8 +49,7 @@ def ensure_datasource(grafana: GrafanaApi, datasource: DatasourceModel): datasource = grafana.datasource.update_datasource(datasource_existing["id"], datasource)["datasource"] else: logger.error( - f"Failed to create or update data source '{datasource}'. " - f"Reason: {ex.message}. Response: {ex.response}" + f"Failed to create or update data source '{datasource}'. Reason: {ex.message}. Response: {ex.response}" ) raise return datasource diff --git a/grafana_client/api.py b/grafana_client/api.py index eb6428d..6b8d161 100644 --- a/grafana_client/api.py +++ b/grafana_client/api.py @@ -186,7 +186,7 @@ def from_env(cls, timeout: Union[float, Tuple[float, float]] = None): timeout = float(os.environ["GRAFANA_TIMEOUT"]) except Exception as ex: raise ValueError( - f"Unable to parse invalid `float` value from " f"`GRAFANA_TIMEOUT` environment variable: {ex}" + f"Unable to parse invalid `float` value from `GRAFANA_TIMEOUT` environment variable: {ex}" ) if timeout is None: timeout = DEFAULT_TIMEOUT diff --git a/grafana_client/elements/_async/dashboard.py b/grafana_client/elements/_async/dashboard.py index 4eace77..11e7dcd 100644 --- a/grafana_client/elements/_async/dashboard.py +++ b/grafana_client/elements/_async/dashboard.py @@ -77,14 +77,14 @@ async def get_dashboards_tags(self): async def get_dashboard_permissions(self, dashboard_id): warnings.warn( - "get_dashboard_permissions is deprecated, " "use corresponding _by_id or _by_uid methods", + "get_dashboard_permissions is deprecated, use corresponding _by_id or _by_uid methods", DeprecationWarning, ) return self.get_permissions_by_id(dashboard_id) async def update_dashboard_permissions(self, dashboard_id, items): warnings.warn( - "update_dashboard_permissions is deprecated, " "use corresponding _by_id or _by_uid methods", + "update_dashboard_permissions is deprecated, use corresponding _by_id or _by_uid methods", DeprecationWarning, ) return self.update_permissions_by_id(dashboard_id, items) diff --git a/grafana_client/elements/dashboard.py b/grafana_client/elements/dashboard.py index 8d3068a..5c3f273 100644 --- a/grafana_client/elements/dashboard.py +++ b/grafana_client/elements/dashboard.py @@ -77,14 +77,14 @@ def get_dashboards_tags(self): def get_dashboard_permissions(self, dashboard_id): warnings.warn( - "get_dashboard_permissions is deprecated, " "use corresponding _by_id or _by_uid methods", + "get_dashboard_permissions is deprecated, use corresponding _by_id or _by_uid methods", DeprecationWarning, ) return self.get_permissions_by_id(dashboard_id) def update_dashboard_permissions(self, dashboard_id, items): warnings.warn( - "update_dashboard_permissions is deprecated, " "use corresponding _by_id or _by_uid methods", + "update_dashboard_permissions is deprecated, use corresponding _by_id or _by_uid methods", DeprecationWarning, ) return self.update_permissions_by_id(dashboard_id, items) diff --git a/test/elements/test_snapshot.py b/test/elements/test_snapshot.py index 6e5f8c3..8ada8c1 100644 --- a/test/elements/test_snapshot.py +++ b/test/elements/test_snapshot.py @@ -118,20 +118,20 @@ def test_get_snapshot_by_key(self, m): def test_delete_snapshot_by_key(self, m): m.delete( "http://localhost/api/snapshots/YYYYYYY", - json={"message": "Snapshot deleted. It might take an hour " "before it's cleared from any CDN " "caches."}, + json={"message": "Snapshot deleted. It might take an hour before it's cleared from any CDN caches."}, ) annotation = self.grafana.snapshots.delete_snapshot_by_key(snapshot_id="YYYYYYY") self.assertEqual( - annotation["message"], "Snapshot deleted. It might take an hour before it's cleared from any " "CDN caches." + annotation["message"], "Snapshot deleted. It might take an hour before it's cleared from any CDN caches." ) @requests_mock.Mocker() def test_delete_snapshot_by_delete_key(self, m): m.get( "http://localhost/api/snapshots-delete/XXXXXXX", - json={"message": "Snapshot deleted. It might take an hour " "before it's cleared from any CDN " "caches."}, + json={"message": "Snapshot deleted. It might take an hour before it's cleared from any CDN caches."}, ) annotation = self.grafana.snapshots.delete_snapshot_by_delete_key(snapshot_delete_key="XXXXXXX") self.assertEqual( - annotation["message"], "Snapshot deleted. It might take an hour before it's cleared from any " "CDN caches." + annotation["message"], "Snapshot deleted. It might take an hour before it's cleared from any CDN caches." )