From 07d18e8ad0b35fef0002aaf639d56262adbd4eb3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:14:24 +0000
Subject: [PATCH 1/4] CI(deps): Update ruff to v0.6.8

---
 .github/workflows/python-code-quality.yml | 2 +-
 .pre-commit-config.yaml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
index 385ad6b9dd..9febdd990e 100644
--- a/.github/workflows/python-code-quality.yml
+++ b/.github/workflows/python-code-quality.yml
@@ -36,7 +36,7 @@ jobs:
       # renovate: datasource=pypi depName=bandit
       BANDIT_VERSION: "1.7.10"
       # renovate: datasource=pypi depName=ruff
-      RUFF_VERSION: "0.6.7"
+      RUFF_VERSION: "0.6.8"
 
     runs-on: ${{ matrix.os }}
     permissions:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 74423979b2..b7a517fba3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
           )
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.7
+    rev: v0.6.8
     hooks:
       # Run the linter.
       - id: ruff

From bc9b7ec05a40c6a49c31199b96f53b9c56b0eabe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:36:37 +0000
Subject: [PATCH 2/4] style: Use `kargs.get("layerTree")` instead of
 `kargs.get("layerTree", None)` (SIM910)

---
 gui/wxpython/gui_core/gselect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/wxpython/gui_core/gselect.py b/gui/wxpython/gui_core/gselect.py
index cec6963a52..04c3a5f136 100644
--- a/gui/wxpython/gui_core/gselect.py
+++ b/gui/wxpython/gui_core/gselect.py
@@ -414,7 +414,7 @@ def SetData(self, **kargs):
             self.multiple = kargs["multiple"]
         if "onPopup" in kargs:
             self.onPopup = kargs["onPopup"]
-        if kargs.get("layerTree", None):
+        if kargs.get("layerTree"):
             self.filterItems = []  # reset
             ltype = kargs["type"]
             for layer in kargs["layerTree"].GetVisibleLayers(skipDigitized=True):

From 0bfe1ddbe9ccaa624a7212381a0e47ce08acf2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:39:45 +0000
Subject: [PATCH 3/4] style: Simplify chained boolean comparison

---
 scripts/r.in.wms/wms_drv.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/r.in.wms/wms_drv.py b/scripts/r.in.wms/wms_drv.py
index 186157ad6d..791926a8af 100644
--- a/scripts/r.in.wms/wms_drv.py
+++ b/scripts/r.in.wms/wms_drv.py
@@ -736,7 +736,7 @@ def _findTileMats(self, tile_mats, region, bbox):
 
             best_diff = best_scale_den - scale_den
             mat_diff = mat_scale_den - scale_den
-            if (best_diff < mat_diff and mat_diff < 0) or (
+            if (best_diff < mat_diff < 0) or (
                 best_diff > mat_diff and best_diff > 0
             ):
                 best_t_mat = t_mat
@@ -1020,7 +1020,7 @@ def _parseTilePattern(self, group_t_patts, bbox, region):
             best_diff = best_res - res[comp_res]
             tile_diff = t_res[comp_res] - res[comp_res]
 
-            if (best_diff < tile_diff and tile_diff < 0) or (
+            if (best_diff < tile_diff < 0) or (
                 best_diff > tile_diff and best_diff > 0
             ):
                 best_res = t_res[comp_res]

From a72f90fc7d2f0e6b654d67f53eabc241c1ad5b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:46:31 +0000
Subject: [PATCH 4/4] Apply black formatting

---
 scripts/r.in.wms/wms_drv.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/r.in.wms/wms_drv.py b/scripts/r.in.wms/wms_drv.py
index 791926a8af..dd666573cf 100644
--- a/scripts/r.in.wms/wms_drv.py
+++ b/scripts/r.in.wms/wms_drv.py
@@ -736,9 +736,7 @@ def _findTileMats(self, tile_mats, region, bbox):
 
             best_diff = best_scale_den - scale_den
             mat_diff = mat_scale_den - scale_den
-            if (best_diff < mat_diff < 0) or (
-                best_diff > mat_diff and best_diff > 0
-            ):
+            if (best_diff < mat_diff < 0) or (best_diff > mat_diff and best_diff > 0):
                 best_t_mat = t_mat
                 best_scale_den = mat_scale_den
 
@@ -1020,9 +1018,7 @@ def _parseTilePattern(self, group_t_patts, bbox, region):
             best_diff = best_res - res[comp_res]
             tile_diff = t_res[comp_res] - res[comp_res]
 
-            if (best_diff < tile_diff < 0) or (
-                best_diff > tile_diff and best_diff > 0
-            ):
+            if (best_diff < tile_diff < 0) or (best_diff > tile_diff and best_diff > 0):
                 best_res = t_res[comp_res]
                 best_patt = pattern