CI(deps): Update ruff to v0.6.1 (OSGeo#4184)

* CI(deps): Update ruff to v0.6.1

* style: Use convention `import xml.etree.ElementTree as ET` for unconventional-import-alias (ICN001)

* checks: Ruff now includes checking of Jupyter notebooks by default

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com>

.github/workflows/python-code-quality.yml

@@ -36,7 +36,7 @@ jobs:
       # renovate: datasource=pypi depName=bandit
       BANDIT_VERSION: "1.7.9"
       # renovate: datasource=pypi depName=ruff
-      RUFF_VERSION: "0.5.7"
+      RUFF_VERSION: "0.6.1"
 
     runs-on: ${{ matrix.os }}
     permissions:

.pre-commit-config.yaml

@@ -37,11 +37,10 @@ repos:
           )
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.5.7
+    rev: v0.6.1
     hooks:
       # Run the linter.
       - id: ruff
-        types_or: [python, pyi, jupyter]
         args: [--fix, --preview]
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.41.0

gui/wxpython/animation/nviztask.py

@@ -14,7 +14,7 @@
 @author Anna Petrasova <kratochanna gmail.com>
 """
 
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 
 from core.workspace import ProcessWorkspaceFile
 from core.gcmd import RunCommand, GException
@@ -33,7 +33,7 @@ def Load(self, filename):
         self.task = gtask.grassTask("m.nviz.image")
         self.filename = filename
         try:
-            gxwXml = ProcessWorkspaceFile(etree.parse(self.filename))
+            gxwXml = ProcessWorkspaceFile(ET.parse(self.filename))
         except Exception:
             raise GException(
                 _(

gui/wxpython/core/menutree.py

@@ -36,7 +36,7 @@
 import os
 import sys
 import copy
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 
 import wx
 
@@ -62,7 +62,7 @@ def __init__(self, filename, expandAddons=True, message_handler=GError):
             group="appearance", key="menustyle", subkey="selection"
         )
 
-        xmlTree = etree.parse(filename)
+        xmlTree = ET.parse(filename)
         if expandAddons:
             expAddons(xmlTree)
             for message in getToolboxMessages():

gui/wxpython/core/toolboxes.py

@@ -17,15 +17,15 @@
 import sys
 import copy
 import shutil
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 from xml.parsers import expat
 
 import grass.script.task as gtask
 import grass.script.core as gcore
 from grass.script.utils import try_remove, decode
 from grass.exceptions import ScriptError, CalledModuleError
 
-ETREE_EXCEPTIONS = (etree.ParseError, expat.ExpatError)
+ETREE_EXCEPTIONS = (ET.ParseError, expat.ExpatError)
 
 # duplicating code from core/globalvar.py
 # if this will become part of grass Python library or module, this should be
@@ -270,19 +270,19 @@ def createTree(distributionRootFile, userRootFile, userDefined=True):
     :return: ElementTree instance
     """
     if userDefined and userRootFile:
-        mainMenu = etree.parse(userRootFile)
+        mainMenu = ET.parse(userRootFile)
     else:
-        mainMenu = etree.parse(distributionRootFile)
+        mainMenu = ET.parse(distributionRootFile)
 
-    toolboxes = etree.parse(toolboxesFile)
+    toolboxes = ET.parse(toolboxesFile)
 
     if userDefined and _getUserToolboxesFile():
-        userToolboxes = etree.parse(_getUserToolboxesFile())
+        userToolboxes = ET.parse(_getUserToolboxesFile())
     else:
         userToolboxes = None
 
-    wxguiItems = etree.parse(wxguiItemsFile)
-    moduleItems = etree.parse(moduleItemsFile)
+    wxguiItems = ET.parse(wxguiItemsFile)
+    moduleItems = ET.parse(moduleItemsFile)
 
     return toolboxes2menudata(
         mainMenu=mainMenu,
@@ -463,11 +463,11 @@ def _expandUserToolboxesItem(node, toolboxes):
     for n in node.findall("./items/user-toolboxes-list"):
         items = node.find("./items")
         idx = list(items).index(n)
-        el = etree.Element("toolbox", attrib={"name": "GeneratedUserToolboxesList"})
+        el = ET.Element("toolbox", attrib={"name": "GeneratedUserToolboxesList"})
         items.insert(idx, el)
-        label = etree.SubElement(el, "label")
+        label = ET.SubElement(el, "label")
         label.text = _("Custom toolboxes")
-        it = etree.SubElement(el, "items")
+        it = ET.SubElement(el, "items")
         for toolbox in tboxes:
             it.append(copy.deepcopy(toolbox))
         items.remove(n)
@@ -551,15 +551,15 @@ def _expandAddonsItem(node):
         idx = list(items).index(n)
         # do not set name since it is already in menudata file
         # attib={'name': 'AddonsList'}
-        el = etree.Element("menu")
+        el = ET.Element("menu")
         items.insert(idx, el)
-        label = etree.SubElement(el, "label")
+        label = ET.SubElement(el, "label")
         label.text = _("Addons")
-        it = etree.SubElement(el, "items")
+        it = ET.SubElement(el, "items")
         for addon in addons:
-            addonItem = etree.SubElement(it, "module-item")
+            addonItem = ET.SubElement(it, "module-item")
             addonItem.attrib = {"name": addon}
-            addonLabel = etree.SubElement(addonItem, "label")
+            addonLabel = ET.SubElement(addonItem, "label")
             addonLabel.text = addon
         items.remove(n)
 
@@ -613,7 +613,7 @@ def _expandRuntimeModules(node, loadMetadata=True):
     for module in modules:
         name = module.get("name")
         if module.find("module") is None:
-            n = etree.SubElement(module, "module")
+            n = ET.SubElement(module, "module")
             n.text = name
 
         if module.find("description") is None:
@@ -627,9 +627,9 @@ def _expandRuntimeModules(node, loadMetadata=True):
                     desc, keywords = _("Module not installed"), ""
             else:
                 desc, keywords = "", ""
-            n = etree.SubElement(module, "description")
+            n = ET.SubElement(module, "description")
             n.text = _escapeXML(desc)
-            n = etree.SubElement(module, "keywords")
+            n = ET.SubElement(module, "keywords")
             n.text = _escapeXML(",".join(keywords))
 
     if hasErrors:
@@ -672,13 +672,13 @@ def _addHandlers(node):
     """Add missing handlers to modules"""
     for n in node.findall(".//module-item"):
         if n.find("handler") is None:
-            handlerNode = etree.SubElement(n, "handler")
+            handlerNode = ET.SubElement(n, "handler")
             handlerNode.text = "OnMenuCmd"
 
     # e.g. g.region -p
     for n in node.findall(".//wxgui-item"):
         if n.find("command") is not None:
-            handlerNode = etree.SubElement(n, "handler")
+            handlerNode = ET.SubElement(n, "handler")
             handlerNode.text = "RunMenuCmd"
 
 
@@ -751,7 +751,7 @@ def _getXMLString(root):
 
     :return: XML as string
     """
-    xml = etree.tostring(root, encoding="UTF-8")
+    xml = ET.tostring(root, encoding="UTF-8")
     return xml.replace(
         b"<?xml version='1.0' encoding='UTF-8'?>\n",
         b"<?xml version='1.0' encoding='UTF-8'?>\n"
@@ -820,12 +820,12 @@ def module_test():
     wxguiItemsFile = os.path.join(WXGUIDIR, "xml", "wxgui_items.xml")
     moduleItemsFile = os.path.join(WXGUIDIR, "xml", "module_items.xml")
 
-    toolboxes = etree.parse(toolboxesFile)
-    userToolboxes = etree.parse(userToolboxesFile)
-    menu = etree.parse(menuFile)
+    toolboxes = ET.parse(toolboxesFile)
+    userToolboxes = ET.parse(userToolboxesFile)
+    menu = ET.parse(menuFile)
 
-    wxguiItems = etree.parse(wxguiItemsFile)
-    moduleItems = etree.parse(moduleItemsFile)
+    wxguiItems = ET.parse(wxguiItemsFile)
+    moduleItems = ET.parse(moduleItemsFile)
 
     tree = toolboxes2menudata(
         mainMenu=menu,
@@ -868,7 +868,7 @@ def module_test():
 
 def validate_file(filename):
     try:
-        etree.parse(filename)
+        ET.parse(filename)
     except ETREE_EXCEPTIONS as error:
         print(
             "XML file <{name}> is not well formed: {error}".format(

gui/wxpython/gmodeler/model.py

@@ -38,7 +38,7 @@
 import mimetypes
 import time
 
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 from xml.sax import saxutils
 
 import wx
@@ -323,7 +323,7 @@ def LoadModel(self, filename):
         """
         # parse workspace file
         try:
-            gxmXml = ProcessModelFile(etree.parse(filename))
+            gxmXml = ProcessModelFile(ET.parse(filename))
         except Exception as e:
             raise GException("{}".format(e))
 

gui/wxpython/gui_core/forms.py

@@ -65,7 +65,7 @@
 import wx.lib.filebrowsebutton as filebrowse
 from wx.lib.newevent import NewEvent
 
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 
 # needed when started from command line and for testing
 if __name__ == "__main__":
@@ -3221,7 +3221,7 @@ def GetCommandInputMapParamKey(self, cmd):
         """
         # parse the interface description
         if not self.grass_task:
-            tree = etree.fromstring(gtask.get_interface_description(cmd))
+            tree = ET.fromstring(gtask.get_interface_description(cmd))
             self.grass_task = gtask.processTask(tree).get_task()
 
             for p in self.grass_task.params:

gui/wxpython/lmgr/workspace.py

@@ -16,7 +16,7 @@
 import os
 import tempfile
 
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 
 import wx
 import wx.aui
@@ -171,7 +171,7 @@ def Load(self, filename):
         """
         # parse workspace file
         try:
-            gxwXml = ProcessWorkspaceFile(etree.parse(filename))
+            gxwXml = ProcessWorkspaceFile(ET.parse(filename))
         except Exception as e:
             GError(
                 parent=self.lmgr,

gui/wxpython/tools/update_menudata.py

@@ -23,7 +23,7 @@
 import sys
 import tempfile
 
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 
 from grass.script import core as grass
 from grass.script import task as gtask
@@ -97,7 +97,7 @@ def updateData(data, modules):
             grass.warning("%s: keywords missing" % module)
         else:
             if node.find("keywords") is None:
-                node.insert(2, etree.Element("keywords"))
+                node.insert(2, ET.Element("keywords"))
                 grass.warning("Adding tag 'keywords' to '%s'" % module)
             node.find("keywords").text = ",".join(modules[module]["keywords"])
 

pyproject.toml

@@ -14,14 +14,12 @@ extend-exclude = '''
 '''
 
 [tool.ruff]
-required-version = ">=0.5.0"
+required-version = ">=0.6.0"
 
 builtins = ["_"]
 
 # In addition to the standard set of exclusions, omit the following files or folders.
 extend-exclude = ["python/libgrass_interface_generator"]
-# In addition to the standard set of inclusions, include `.ipynb` files.
-extend-include = ["*.ipynb"]
 
 [tool.ruff.lint]
 # See https://docs.astral.sh/ruff/rules/

python/grass/gunittest/reporters.py

@@ -13,7 +13,7 @@
 import datetime
 from pathlib import Path
 from xml.sax import saxutils
-import xml.etree.ElementTree as et
+import xml.etree.ElementTree as ET
 import subprocess
 import collections
 import re
@@ -199,7 +199,7 @@ def get_svn_info():
         rc = p.poll()
         info = {}
         if not rc:
-            root = et.fromstring(stdout)
+            root = ET.fromstring(stdout)
             # TODO: get also date if this make sense
             # expecting only one <entry> element
             entry = root.find("entry")
@@ -257,7 +257,7 @@ def get_svn_path_authors(path, from_date=None):
         stdout, stderr = p.communicate()
         rc = p.poll()
         if not rc:
-            root = et.fromstring(stdout)
+            root = ET.fromstring(stdout)
             # TODO: get also date if this make sense
             # expecting only one <entry> element
             author_nodes = root.iterfind("*/author")

python/grass/script/task.py

@@ -21,14 +21,14 @@
 import os
 import re
 import sys
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 from xml.parsers import expat
 
 from grass.exceptions import ScriptError
 from .utils import decode, split
 from .core import Popen, PIPE, get_real_command
 
-ETREE_EXCEPTIONS = (etree.ParseError, expat.ExpatError)
+ETREE_EXCEPTIONS = (ET.ParseError, expat.ExpatError)
 
 
 class grassTask:
@@ -63,7 +63,7 @@ def __init__(self, path=None, blackList=None):
         if path is not None:
             try:
                 processTask(
-                    tree=etree.fromstring(get_interface_description(path)), task=self
+                    tree=ET.fromstring(get_interface_description(path)), task=self
                 )
             except ScriptError as e:
                 self.errorMsg = e.value
@@ -523,7 +523,7 @@ def parse_interface(name, parser=processTask, blackList=None):
     :param blackList:
     """
     try:
-        tree = etree.fromstring(get_interface_description(name))
+        tree = ET.fromstring(get_interface_description(name))
     except ETREE_EXCEPTIONS as error:
         raise ScriptError(
             _("Cannot parse interface description of<{name}> module: {error}").format(

scripts/g.extension.all/g.extension.all.py

@@ -41,7 +41,7 @@
 import re
 import sys
 
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as ET
 
 from urllib import request as urlrequest
 from urllib.error import HTTPError, URLError
@@ -66,7 +66,7 @@ def get_extensions():
     # read XML file
     fo = open(fXML, "r")
     try:
-        tree = etree.fromstring(fo.read())
+        tree = ET.fromstring(fo.read())
     except Exception as e:
         gs.error(_("Unable to parse metadata file: %s") % e)
         fo.close()
@@ -184,7 +184,7 @@ def find_addon_name(addons):
         url=url,
         response_format="application/xml",
     )
-    tree = etree.fromstring(response.read())
+    tree = ET.fromstring(response.read())
     result = []
     for addon in addons:
         found = False