Merge branch 'OSGeo:main' into main

Author: echoix

.github/workflows/additional_checks.yml

@@ -38,7 +38,7 @@ jobs:
         with:
           python-version: "3.14"
       - name: Install uv and restore its cache
-        uses: astral-sh/setup-uv@2ddd2b9cb38ad8efd50337e8ab201519a34c9f24 # v7.1.1
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           # To not have the last commit JSON and release notes files affected on
           # releases, if copying the contents displayed in the CI logs.

flake.lock

@@ -1660,7 +1660,7 @@ def __init__(
         self.tselect = Select(parent=self, type="strds")
         iconTheme = UserSettings.Get(group="appearance", key="iconTheme", subkey="type")
         bitmapPath = os.path.join(globalvar.ICONDIR, iconTheme, "layer-open.png")
-        if os.path.isfile(bitmapPath) and os.path.getsize(bitmapPath):
+        if os.path.isfile(bitmapPath) and Path(bitmapPath).stat().st_size:
             bitmap = wx.Bitmap(name=bitmapPath)
         else:
             bitmap = wx.ArtProvider.GetBitmap(

gui/wxpython/animation/dialogs.py

@@ -153,9 +153,9 @@ def getMenudataFile(userRootFile, newFile, fallback):
             )
         else:
             # if newer files -> generate new
-            menudataTime = os.path.getmtime(menudataFile)
+            menudataTime = Path(menudataFile).stat().st_mtime
             if _getUserToolboxesFile():
-                if os.path.getmtime(_getUserToolboxesFile()) > menudataTime:
+                if Path(_getUserToolboxesFile()).stat().st_mtime > menudataTime:
                     _debug(
                         2,
                         (
@@ -165,7 +165,7 @@ def getMenudataFile(userRootFile, newFile, fallback):
                     )
                     generateNew = True
             if userRootFile:
-                if os.path.getmtime(userRootFile) > menudataTime:
+                if Path(userRootFile).stat().st_mtime > menudataTime:
                     _debug(
                         2,
                         (

gui/wxpython/core/toolboxes.py

@@ -19,6 +19,7 @@
 import platform
 import os
 from itertools import starmap
+from pathlib import Path
 
 import wx
 from wx.lib.agw import aui
@@ -281,7 +282,7 @@ def CreateSelectionButton(self, tooltip):
         Button must be custom (not toolbar tool) to set smaller width.
         """
         arrowPath = os.path.join(IMGDIR, "small_down_arrow.png")
-        if os.path.isfile(arrowPath) and os.path.getsize(arrowPath):
+        if os.path.isfile(arrowPath) and Path(arrowPath).stat().st_size:
             bitmap = wx.Bitmap(name=arrowPath)
         else:
             bitmap = wx.ArtProvider.GetBitmap(

gui/wxpython/gui_core/toolbars.py

@@ -81,7 +81,7 @@ def GetBitmap(self, size=None):
                 id=self.imagepath, client=wx.ART_TOOLBAR, size=size
             )
         elif self.type == "img":
-            if os.path.isfile(self.imagepath) and os.path.getsize(self.imagepath):
+            if os.path.isfile(self.imagepath) and Path(self.imagepath).stat().st_size:
                 if size and len(size) == 2:
                     image = wx.Image(name=self.imagepath)
                     image.Rescale(size[0], size[1])

gui/wxpython/icons/icon.py

@@ -32,6 +32,7 @@
 import time
 import shutil
 import fileinput
+from pathlib import Path
 
 from grass.script.utils import try_remove
 from grass.script import core as grass
@@ -616,7 +617,7 @@ def watcher(self):
 
         # TODO: events
         try:
-            currentCmdFileTime = os.path.getmtime(monFile["cmd"])
+            currentCmdFileTime = Path(monFile["cmd"]).stat().st_mtime
             if currentCmdFileTime > self.cmdTimeStamp:
                 self.timer.Stop()
                 self.cmdTimeStamp = currentCmdFileTime

gui/wxpython/mapdisp/main.py

@@ -25,6 +25,7 @@
 import time
 import math
 import sys
+from pathlib import Path
 
 import wx
 
@@ -799,7 +800,7 @@ def GetOverlay(self):
             if (
                 overlay.mapfile is None
                 or not os.path.isfile(overlay.mapfile)
-                or (not os.path.getsize(overlay.mapfile))
+                or (not Path(overlay.mapfile).stat().st_size)
             ):
                 continue
             img = utils.autoCropImageFromFile(overlay.mapfile)
@@ -824,7 +825,7 @@ def GetImage(self):
         if (
             self.Map.mapfile
             and os.path.isfile(self.Map.mapfile)
-            and os.path.getsize(self.Map.mapfile)
+            and Path(self.Map.mapfile).stat().st_size
         ):
             img = wx.Image(self.Map.mapfile, wx.BITMAP_TYPE_ANY)
         else:

gui/wxpython/mapwin/buffered.py

@@ -2051,7 +2051,7 @@ def GetImage(self):
         if (
             self.Map.mapfile
             and os.path.isfile(self.Map.mapfile)
-            and os.path.getsize(self.Map.mapfile)
+            and Path(self.Map.mapfile).stat().st_size
         ):
             img = wx.Image(self.Map.mapfile, wx.BITMAP_TYPE_ANY)
         else:

gui/wxpython/modules/colorrules.py

@@ -19,6 +19,7 @@
 
 import os
 import sys
+from pathlib import Path
 
 import wx
 
@@ -213,7 +214,7 @@ def GetImage(self):
         if (
             self.Map.mapfile
             and os.path.isfile(self.Map.mapfile)
-            and os.path.getsize(self.Map.mapfile)
+            and Path(self.Map.mapfile).stat().st_size
         ):
             img = wx.Image(self.Map.mapfile, wx.BITMAP_TYPE_ANY)
         else: