Update Ruff to 0.11 (2025 formatting style introduced in 0.9) (#2458)

Author: Avasam

.github/workflows/main.yml

@@ -152,16 +152,25 @@ jobs:
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
       - run: pip install clang-format==18.1.* pycln
+      # !cancelled(): Show issues even if the previous steps failed. But still fail the job
       - run: pycln . --config=pycln.toml --check
-      - uses: astral-sh/ruff-action@v3
+      - name: Run Ruff linter
+        uses: astral-sh/ruff-action@v3
         with:
-          version: "0.8.4"
-      - run: ruff format --check
-      - run: | # Too many files to fit in a single command, also exclude vendored Scintilla and MAPIStubLibrary
+          version: "0.11.0"
+        if: ${{ !cancelled() }}
+      - name: Run Ruff formatter
+        run: ruff format --check
+        if: ${{ !cancelled() }}
+      # Too many files to fit in a single command, also exclude vendored Scintilla and MAPIStubLibrary
+      - run: |
           clang-format --Werror --dry-run $(git ls-files '*.cpp' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')
           if ($LastExitCode -ne 0) { exit $LastExitCode }
+        if: ${{ !cancelled() }}
+      - run: |
           clang-format --Werror --dry-run $(git ls-files '*.h' ':!:Pythonwin/Scintilla/' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')
           if ($LastExitCode -ne 0) { exit $LastExitCode }
+        if: ${{ !cancelled() }}
 
   mypy:
     runs-on: windows-2019

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
         args: [--config=pycln.toml]
         verbose: true
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.11.0
     hooks:
       - id: ruff # Run the linter.
         args: [--fix]

AutoDuck/BuildHHP.py

@@ -65,9 +65,9 @@ def handle_globs(lGlobs):
         sCommonPrefix = os.path.split(sCommonPrefix)[0]
         sCommonPrefix = os.path.normpath(sCommonPrefix) + "\\"
     # else we have a trailing slash - it means we _expect_ it to be a patch as-is.
-    assert (
-        os.path.isdir(sCommonPrefix) and sCommonPrefix[-1] == "\\"
-    ), "commonprefix splitting ain't gunna work!"
+    assert os.path.isdir(sCommonPrefix) and sCommonPrefix[-1] == "\\", (
+        "commonprefix splitting ain't gunna work!"
+    )
     print("sCommonPrefix=", sCommonPrefix)
     # Ok, now remove this common prefix from every file:
     lRelativeFiles = []

AutoDuck/document_object.py

@@ -13,9 +13,9 @@ def startElement(self, name, attrs):
             self.document.categories.append(Category(attrs))
         elif name == "overviews":
             category = self.document.categories[-1]
-            assert (
-                category.overviewItems is None
-            ), f"category {category!r} already has overviews"
+            assert category.overviewItems is None, (
+                f"category {category!r} already has overviews"
+            )
             category.overviewItems = OverviewItems(attrs)
         elif name == "item":
             item = Item(attrs)

Pythonwin/pywin/scintilla/control.py

@@ -424,9 +424,9 @@ def GetSelText(self):
 
     def SetSel(self, start=0, end=None):
         if isinstance(start, tuple):
-            assert (
-                end is None
-            ), "If you pass a point in the first param, the second must be None"
+            assert end is None, (
+                "If you pass a point in the first param, the second must be None"
+            )
             start, end = start
         elif end is None:
             end = start
@@ -453,9 +453,9 @@ def GetLineCount(self):
     def LineFromChar(self, charPos=-1):
         if charPos == -1:
             charPos = self.GetSel()[0]
-        assert (
-            charPos >= 0 and charPos <= self.GetTextLength()
-        ), f"The charPos postion ({charPos}) is invalid (max={self.GetTextLength()})"
+        assert charPos >= 0 and charPos <= self.GetTextLength(), (
+            f"The charPos postion ({charPos}) is invalid (max={self.GetTextLength()})"
+        )
         # return self.SendScintilla(EM_EXLINEFROMCHAR, charPos)
         # EM_EXLINEFROMCHAR puts charPos in lParam, not wParam
         return self.SendScintilla(EM_EXLINEFROMCHAR, 0, charPos)
@@ -476,9 +476,9 @@ def GetTextRange(self, start=0, end=-1, decode=True):
         if end == -1:
             end = self.SendScintilla(scintillacon.SCI_GETTEXTLENGTH)
         assert end >= start, "Negative index requested (%d/%d)" % (start, end)
-        assert (
-            start >= 0 and start <= self.GetTextLength()
-        ), "The start postion is invalid"
+        assert start >= 0 and start <= self.GetTextLength(), (
+            "The start postion is invalid"
+        )
         assert end >= 0 and end <= self.GetTextLength(), "The end postion is invalid"
         initer = null_byte * (end - start + 1)
         buff = array.array("b", initer)

Pythonwin/pywin/tools/hierlist.py

@@ -97,10 +97,10 @@ def HierInit(self, parent, listControl=None):  # Used when window first exists.
         else:
             self.listControl = listControl
             lbid = listControl.GetDlgCtrlID()
-            assert (
-                self.listBoxId is None or self.listBoxId == lbid
-            ), "An invalid listbox control ID has been specified (specified as {}, but exists as {})".format(
-                self.listBoxId, lbid
+            assert self.listBoxId is None or self.listBoxId == lbid, (
+                "An invalid listbox control ID has been specified (specified as {}, but exists as {})".format(
+                    self.listBoxId, lbid
+                )
             )
             self.listBoxId = lbid
         self.listControl.SetImageList(self.imageList, commctrl.LVSIL_NORMAL)

adodbapi/test/adodbapitest.py

@@ -65,9 +65,9 @@ def testErrorHandlerInherits(self):
         mycallable = lambda connection, cursor, errorclass, errorvalue: 1
         conn.errorhandler = mycallable
         crsr = conn.cursor()
-        assert (
-            crsr.errorhandler == mycallable
-        ), "Error handler on crsr should be same as on connection"
+        assert crsr.errorhandler == mycallable, (
+            "Error handler on crsr should be same as on connection"
+        )
 
     def testDefaultErrorHandlerConnection(self):
         conn = self.getConnection()
@@ -97,9 +97,9 @@ def testOwnErrorHandlerConnection(self):
         except:
             pass
         # The Standard errorhandler appends error to messages attribute
-        assert (
-            len(conn.messages) > 0
-        ), "Setting errorhandler to none  should bring back the standard error handler"
+        assert len(conn.messages) > 0, (
+            "Setting errorhandler to none  should bring back the standard error handler"
+        )
 
     def testDefaultErrorHandlerCursor(self):
         crsr = self.getConnection().cursor()
@@ -126,9 +126,9 @@ def testOwnErrorHandlerCursor(self):
         except:
             pass
         # The Standard errorhandler appends error to messages attribute
-        assert (
-            len(crsr.messages) > 0
-        ), "Setting errorhandler to none  should bring back the standard error handler"
+        assert len(crsr.messages) > 0, (
+            "Setting errorhandler to none  should bring back the standard error handler"
+        )
 
     def testUserDefinedConversions(self):
         try:
@@ -645,15 +645,15 @@ def testRowIterator(self):
                     'returned value:"%s" != test value:"%s"' % (rec[j], inParam[j])
                 )
             # check that we can get a complete tuple from a row
-            assert (
-                tuple(rec) == inParam
-            ), f'returned value:"{rec!r}" != test value:"{inParam!r}"'
+            assert tuple(rec) == inParam, (
+                f'returned value:"{rec!r}" != test value:"{inParam!r}"'
+            )
             # test that slices of rows work
             slice1 = tuple(rec[:-1])
             slice2 = tuple(inParam[0:2])
-            assert (
-                slice1 == slice2
-            ), f'returned value:"{slice1!r}" != test value:"{slice2!r}"'
+            assert slice1 == slice2, (
+                f'returned value:"{slice1!r}" != test value:"{slice2!r}"'
+            )
             # now test named column retrieval
             assert rec["fldTwo"] == inParam[0]
             assert rec.fldThree == inParam[1]
@@ -915,9 +915,9 @@ def testRollBack(self):
         assert len(rs) == 1
         self.conn.rollback()
         crsr.execute(selectSql)
-        assert (
-            crsr.fetchone() is None
-        ), "cursor.fetchone should return None if a query retrieves no rows"
+        assert crsr.fetchone() is None, (
+            "cursor.fetchone should return None if a query retrieves no rows"
+        )
         crsr.execute("SELECT fldData from xx_%s" % config.tmp)
         rs = crsr.fetchall()
         assert len(rs) == 9, "the original records should still be present"
@@ -973,9 +973,9 @@ def testAutoRollback(self):
             row = crsr.fetchone()
         except api.DatabaseError:
             row = None  # if the entire table disappeared the rollback was perfect and the test passed
-        assert (
-            row is None
-        ), f"cursor.fetchone should return None if a query retrieves no rows. Got {row!r}"
+        assert row is None, (
+            f"cursor.fetchone should return None if a query retrieves no rows. Got {row!r}"
+        )
         self.helpRollbackTblTemp()
 
     def testAutoCommit(self):
@@ -1111,9 +1111,9 @@ def testVariableReturningStoredProcedure(self):
         )
         assert retvalues[0] == "Dodsworth", f'{retvalues[0]!r} is not "Dodsworth"'
         assert retvalues[1] == "Anne", f'{retvalues[1]!r} is not "Anne"'
-        assert (
-            retvalues[2] == "DodsworthAnne"
-        ), f'{retvalues[2]!r} is not "DodsworthAnne"'
+        assert retvalues[2] == "DodsworthAnne", (
+            f'{retvalues[2]!r} is not "DodsworthAnne"'
+        )
         self.conn.rollback()
 
     def testMultipleSetReturn(self):
@@ -1200,9 +1200,9 @@ def testIncorrectStoredProcedureParameter(self):
             {"parameters": ["this is wrong", "Anne", "not Alice"]},
         )
         if result[0]:  # the expected exception was raised
-            assert "@theInput" in str(result[1]) or "DatabaseError" in str(
-                result
-            ), "Identifies the wrong erroneous parameter"
+            assert "@theInput" in str(result[1]) or "DatabaseError" in str(result), (
+                "Identifies the wrong erroneous parameter"
+            )
         else:
             assert result[0], result[1]  # incorrect or no exception
         self.conn.rollback()

adodbapi/test/adodbapitestconfig.py

@@ -179,6 +179,6 @@
         **kws,
     )
 
-assert (
-    doAccessTest or doSqlServerTest or doMySqlTest or doPostgresTest
-), "No database engine found for testing"
+assert doAccessTest or doSqlServerTest or doMySqlTest or doPostgresTest, (
+    "No database engine found for testing"
+)

com/win32com/client/genpy.py

@@ -931,9 +931,9 @@ def _Build_CoClassChildren(self, coclass, coclass_info, oleItems, vtableItems):
                 if clsid not in vtableItems and refAttr[11] & pythoncom.TYPEFLAG_FDUAL:
                     refType = refType.GetRefTypeInfo(refType.GetRefTypeOfImplType(-1))
                     refAttr = refType.GetTypeAttr()
-                    assert (
-                        refAttr.typekind == pythoncom.TKIND_INTERFACE
-                    ), "must be interface bynow!"
+                    assert refAttr.typekind == pythoncom.TKIND_INTERFACE, (
+                        "must be interface bynow!"
+                    )
                     vtableItem = VTableItem(refType, refAttr, doc)
                     vtableItems[clsid] = vtableItem
         coclass.sources = list(sources.values())
@@ -965,7 +965,9 @@ def _Build_Interface(self, type_info_tuple):
         return oleItem, vtableItem
 
     def BuildOleItemsFromType(self):
-        assert self.bBuildHidden, "This code doesn't look at the hidden flag - I thought everyone set it true!?!?!"
+        assert self.bBuildHidden, (
+            "This code doesn't look at the hidden flag - I thought everyone set it true!?!?!"
+        )
         oleItems = {}
         enumItems = {}
         recordItems = {}
@@ -1274,9 +1276,9 @@ def generate_child(self, child, dir):
                             if vtableItem is not None:
                                 vtableItems[clsid] = vtableItem
 
-            assert (
-                found
-            ), f"Can't find the '{child}' interface in the CoClasses, or the interfaces"
+            assert found, (
+                f"Can't find the '{child}' interface in the CoClasses, or the interfaces"
+            )
             # Make a map of iid: dispitem, vtableitem)
             items = {}
             for key, value in oleItems.items():

com/win32com/server/register.py

@@ -210,9 +210,9 @@ def RegisterServer(
     # And if we are frozen, ignore the ones that don't make sense in this
     # context.
     if pythoncom.frozen:
-        assert (
-            sys.frozen
-        ), "pythoncom is frozen, but sys.frozen is not set - don't know the context!"
+        assert sys.frozen, (
+            "pythoncom is frozen, but sys.frozen is not set - don't know the context!"
+        )
         if sys.frozen == "dll":
             clsctx &= pythoncom.CLSCTX_INPROC_SERVER
         else: