Update ruff to latest (#1933)

* Update ruff

* rm Self

---------

Co-authored-by: Shatakshi Mishra <[email protected]>

Author: cidrblock

.config/pydoclint-baseline.txt

@@ -45,7 +45,7 @@ repos:
       - id: toml-sort-fix
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.10"
+    rev: "v0.11.2"
     hooks:
       - id: ruff
         args:

.pre-commit-config.yaml

@@ -101,7 +101,6 @@ def md_settings_dump() -> str:
 
 
 def _params_row_for_entry(entry: SettingsEntry) -> tuple[str, ...]:
-    # pylint: disable=too-many-branches
     """Create a row entry for one settings parameter.
 
     :param entry: The settings entry for which the row will be generated

docs/_ext/regenerate_docs.py

@@ -85,6 +85,7 @@ allow-init-docstring = true
 arg-type-hints-in-docstring = false
 baseline = ".config/pydoclint-baseline.txt"
 check-return-types = false
+check-yield-types = false
 exclude = '\.git|\.test_logs|\.tox|build|out|tests/fixtures|venv'
 should-document-private-class-attributes = true
 show-filenames-in-every-violation-message = true
@@ -122,120 +123,225 @@ disable = [
   "fixme",
   "too-few-public-methods",
   "unsubscriptable-object",
+  "unknown-option-value",
   # https://gist.github.com/cidrblock/ec3412bacfeb34dbc2d334c1d53bef83
   "C0103", # invalid-name / ruff N815
+  "C0105", # typevar-name-incorrect-variance / ruff PLC0105
   "C0112", # empty-docstring / ruff D419
+  "C0113", # unneeded-not / ruff SIM208
   "C0114", # missing-module-docstring / ruff D100
   "C0115", # missing-class-docstring / ruff D101
   "C0116", # missing-function-docstring / ruff D103
   "C0121", # singleton-comparison / ruff PLC0121
   "C0123", # unidiomatic-typecheck / ruff E721
-  # "C0198", # bad-docstring-quotes / ruff Q002
-  # "C0199", # docstring-first-line-empty / ruff D210
+  "C0131", # typevar-double-variance / ruff PLC0131
+  "C0132", # typevar-name-mismatch / ruff PLC0132
+  "C0198", # bad-docstring-quotes / ruff Q002
+  "C0199", # docstring-first-line-empty / ruff D210
+  "C0201", # consider-iterating-dictionary / ruff SIM118
   "C0202", # bad-classmethod-argument / ruff PLC0202
+  "C0205", # single-string-used-for-slots / ruff PLC0205
+  "C0206", # consider-using-dict-items / ruff PLC0206
+  "C0208", # use-sequence-for-iteration / ruff PLC0208
   "C0301", # line-too-long / ruff E501
+  "C0303", # trailing-whitespace / ruff W291
   "C0304", # missing-final-newline / ruff W292
-  "C0325", # superfluous-parens / ruff UP034
+  "C0305", # trailing-newlines / ruff W391
+  "C0321", # multiple-statements / ruff PLC0321
   "C0410", # multiple-imports / ruff E401
   "C0411", # wrong-import-order / ruff I001
   "C0412", # ungrouped-imports / ruff I001
   "C0413", # wrong-import-position / ruff E402
   "C0414", # useless-import-alias / ruff PLC0414
-  # "C0501", # consider-using-any-or-all / ruff PLC0501
-  # "C2201", # misplaced-comparison-constant / ruff SIM300
-  "C3001", # unnecessary-lambda-assignment / ruff PLC3001
+  "C0415", # import-outside-toplevel / ruff PLC0415
+  "C0501", # consider-using-any-or-all / ruff PLC0501
+  "C1802", # use-implicit-booleaness-not-len / ruff PLC1802
+  "C1901", # compare-to-empty-string / ruff PLC1901
+  "C2201", # misplaced-comparison-constant / ruff SIM300
+  "C2401", # non-ascii-name / ruff PLC2401
+  "C2403", # non-ascii-module-import / ruff PLC2403
+  "C2701", # import-private-name / ruff PLC2701
+  "C2801", # unnecessary-dunder-call / ruff PLC2801
+  "C3001", # unnecessary-lambda-assignment / ruff E731
   "C3002", # unnecessary-direct-lambda-call / ruff PLC3002
-  "E0001", # syntax-error / ruff E999
+  "E0001", # syntax-error / ruff PLE0001
+  "E0100", # init-is-generator / ruff PLE0100
   "E0101", # return-in-init / ruff PLE0101
   "E0102", # function-redefined / ruff F811
   "E0103", # not-in-loop / ruff PLE0103
   "E0104", # return-outside-function / ruff F706
   "E0105", # yield-outside-function / ruff F704
   "E0107", # nonexistent-operator / ruff B002
+  "E0112", # too-many-star-expressions / ruff F622
+  "E0115", # nonlocal-and-global / ruff PLE0115
   "E0116", # continue-in-finally / ruff PLE0116
   "E0117", # nonlocal-without-binding / ruff PLE0117
   "E0118", # used-prior-global-declaration / ruff PLE0118
-  "E0211", # no-method-argument / ruff N805
   "E0213", # no-self-argument / ruff N805
+  "E0237", # assigning-non-slot / ruff PLE0237
+  "E0241", # duplicate-bases / ruff PLE0241
+  "E0302", # unexpected-special-method-signature / ruff PLE0302
+  "E0303", # invalid-length-returned / ruff PLE0303
+  "E0304", # invalid-bool-returned / ruff PLE0304
+  "E0305", # invalid-index-returned / ruff PLE0305
+  "E0308", # invalid-bytes-returned / ruff PLE0308
+  "E0309", # invalid-hash-returned / ruff PLE0309
+  "E0402", # relative-beyond-top-level / ruff TID252
+  "E0601", # used-before-assignment / ruff F821
   "E0602", # undefined-variable / ruff F821
+  "E0603", # undefined-all-variable / ruff F822
   "E0604", # invalid-all-object / ruff PLE0604
   "E0605", # invalid-all-format / ruff PLE0605
+  "E0643", # potential-index-error / ruff PLE0643
+  "E0704", # misplaced-bare-raise / ruff PLE0704
   "E0711", # notimplemented-raised / ruff F901
-  "E1133", # not-an-iterable
+  "E1132", # repeated-keyword / ruff PLE1132
   "E1142", # await-outside-async / ruff PLE1142
   "E1205", # logging-too-many-args / ruff PLE1205
   "E1206", # logging-too-few-args / ruff PLE1206
+  "E1300", # bad-format-character / ruff PLE1300
   "E1301", # truncated-format-string / ruff F501
   "E1302", # mixed-format-string / ruff F506
   "E1303", # format-needs-mapping / ruff F502
   "E1304", # missing-format-string-key / ruff F524
+  "E1305", # too-many-format-args / ruff F522
+  "E1306", # too-few-format-args / ruff F524
   "E1307", # bad-string-format-type / ruff PLE1307
   "E1310", # bad-str-strip-call / ruff PLE1310
+  "E1519", # singledispatch-method / ruff PLE1519
+  "E1520", # singledispatchmethod-function / ruff PLE1520
+  "E1700", # yield-inside-async-function / ruff PLE1700
   "E2502", # bidirectional-unicode / ruff PLE2502
   "E2510", # invalid-character-backspace / ruff PLE2510
   "E2512", # invalid-character-sub / ruff PLE2512
   "E2513", # invalid-character-esc / ruff PLE2513
   "E2514", # invalid-character-nul / ruff PLE2514
   "E2515", # invalid-character-zero-width-space / ruff PLE2515
+  "E4703", # modified-iterating-set / ruff PLE4703
   "R0123", # literal-comparison / ruff F632
+  "R0124", # comparison-with-itself / ruff PLR0124
   "R0133", # comparison-of-constants / ruff PLR0133
+  "R0202", # no-classmethod-decorator / ruff PLR0202
+  "R0203", # no-staticmethod-decorator / ruff PLR0203
   "R0205", # useless-object-inheritance / ruff UP004
+  "R0206", # property-with-parameters / ruff PLR0206
+  "R0402", # consider-using-from-import / ruff PLR0402
+  "R0904", # too-many-public-methods / ruff PLR0904
   "R0911", # too-many-return-statements / ruff PLR0911
   "R0912", # too-many-branches / ruff PLR0912
+  "R0913", # too-many-arguments / ruff PLR0913
+  "R0914", # too-many-locals / ruff PLR0914
   "R0915", # too-many-statements / ruff PLR0915
-  # "R1260", # too-complex / ruff C901
-  "R1701", # consider-merging-isinstance / ruff PLR1701
-  "R1706", # consider-using-ternary / ruff SIM108
+  "R0916", # too-many-boolean-expressions / ruff PLR0916
+  "R1260", # too-complex / ruff C901
+  "R1701", # consider-merging-isinstance / ruff SIM101
+  "R1702", # too-many-nested-blocks / ruff PLR1702
+  "R1703", # simplifiable-if-statement / ruff SIM108
+  "R1704", # redefined-argument-from-local / ruff PLR1704
+  "R1705", # no-else-return / ruff RET505
   "R1707", # trailing-comma-tuple / ruff COM818
   "R1710", # inconsistent-return-statements / ruff PLR1710
   "R1711", # useless-return / ruff PLR1711
+  "R1714", # consider-using-in / ruff PLR1714
   "R1715", # consider-using-get / ruff SIM401
   "R1717", # consider-using-dict-comprehension / ruff C402
   "R1718", # consider-using-set-comprehension / ruff C401
-  "R1721", # unnecessary-comprehension / ruff PLR1721
+  "R1719", # simplifiable-if-expression / ruff PLR1719
+  "R1720", # no-else-raise / ruff RET506
+  "R1721", # unnecessary-comprehension / ruff C416
   "R1722", # consider-using-sys-exit / ruff PLR1722
+  "R1723", # no-else-break / ruff RET508
+  "R1724", # no-else-continue / ruff RET507
   "R1725", # super-with-arguments / ruff UP008
   "R1728", # consider-using-generator / ruff C417
-  "R1729", # use-a-generator / ruff C417
+  "R1729", # use-a-generator / ruff C419
+  "R1730", # consider-using-min-builtin / ruff PLR1730
+  "R1731", # consider-using-max-builtin / ruff PLR1730
+  "R1732", # consider-using-with / ruff SIM115
+  "R1733", # unnecessary-dict-index-lookup / ruff PLR1733
+  "R1734", # use-list-literal / ruff C405
   "R1734", # use-list-literal / ruff C405
   "R1735", # use-dict-literal / ruff C406
-  # "R2004", # magic-value-comparison / ruff PLR2004
-  # "R5501", # else-if-used / ruff PLR5501
-  # "R6002", # consider-using-alias / ruff UP006
-  # "R6003", # consider-alternative-union-syntax / ruff UP007
+  "R2004", # magic-value-comparison / ruff PLR2004
+  "R2044", # empty-comment / ruff PLR2044
+  "R5501", # else-if-used / ruff PLR5501
+  "R6002", # consider-using-alias / ruff UP006
+  "R6003", # consider-alternative-union-syntax / ruff UP007
+  "R6104", # consider-using-augmented-assign / ruff PLR6104
+  "R6201", # use-set-for-membership / ruff PLR6201
+  "R6301", # no-self-use / ruff PLR6301
   "W0102", # dangerous-default-value / ruff B006
   "W0104", # pointless-statement / ruff B018
   "W0106", # expression-not-assigned / ruff B018
+  "W0107", # unnecessary-pass / ruff PIE790
+  "W0108", # unnecessary-lambda / ruff PLW0108
   "W0109", # duplicate-key / ruff F601
   "W0120", # useless-else-on-loop / ruff PLW0120
+  "W0122", # exec-used / ruff S102
+  "W0123", # eval-used / ruff S307
+  "W0127", # self-assigning-variable / ruff PLW0127
   "W0129", # assert-on-string-literal / ruff PLW0129
-  # "W0160", # consider-ternary-expression / ruff SIM108
+  "W0130", # duplicate-value / ruff B033
+  "W0131", # named-expr-without-context / ruff PLW0131
+  "W0133", # pointless-exception-statement / ruff PLW0133
+  "W0150", # lost-exception / ruff B012
+  "W0160", # consider-ternary-expression / ruff SIM108
+  "W0177", # nan-comparison / ruff PLW0177
   "W0199", # assert-on-tuple / ruff F631
+  "W0211", # bad-staticmethod-argument / ruff PLW0211
+  "W0212", # protected-access / ruff SLF001
+  "W0245", # super-without-brackets / ruff PLW0245
+  "W0301", # unnecessary-semicolon / ruff E703
+  "W0311", # bad-indentation / ruff E111
   "W0401", # wildcard-import / ruff F403
+  "W0404", # reimported / ruff F811
   "W0406", # import-self / ruff PLW0406
   "W0410", # misplaced-future / ruff F404
+  "W0511", # fixme / ruff PLW0511
   "W0602", # global-variable-not-assigned / ruff PLW0602
   "W0603", # global-statement / ruff PLW0603
+  "W0604", # global-at-module-level / ruff PLW0604
   "W0611", # unused-import / ruff F401
   "W0612", # unused-variable / ruff F841
   "W0613", # unused-argument / ruff ARG001
   "W0622", # redefined-builtin / ruff A001
   "W0640", # cell-var-from-loop / ruff B023
   "W0702", # bare-except / ruff E722
   "W0705", # duplicate-except / ruff B014
+  "W0706", # try-except-raise / ruff TRY302
+  "W0707", # raise-missing-from / ruff B904
   "W0711", # binary-op-exception / ruff PLW0711
-  "W0718", # broad-exception-caught / ruff PLW0718
-  "W1300", # bad-format-string-key / ruff PLW1300
+  "W0718", # broad-exception-caught / ruff BLE001
+  "W0719", # broad-exception-raised / ruff TRY002
+  "W1113", # keyword-arg-before-vararg / ruff B026
+  "W1201", # logging-not-lazy / ruff G002
+  "W1202", # logging-format-interpolation / ruff G001
+  "W1203", # logging-fstring-interpolation / ruff G004
   "W1301", # unused-format-string-key / ruff F504
-  "W1302", # bad-format-string / ruff PLW1302
+  "W1302", # bad-format-string / ruff F521
+  "W1303", # missing-format-argument-key / ruff F524
   "W1304", # unused-format-string-argument / ruff F507
-  "W1308", # duplicate-string-formatting-argument / ruff PLW1308
+  "W1305", # format-combined-specification / ruff F525
   "W1309", # f-string-without-interpolation / ruff F541
-  "W1310", # format-string-without-interpolation / ruff PLW1310
+  "W1310", # format-string-without-interpolation / ruff F541
   "W1401", # anomalous-backslash-in-string / ruff W605
+  "W1404", # implicit-str-concat / ruff ISC001
   "W1405", # inconsistent-quotes / ruff Q000
+  "W1406", # redundant-u-string-prefix / ruff UP025
+  "W1501", # bad-open-mode / ruff PLW1501
   "W1508", # invalid-envvar-default / ruff PLW1508
-  "W1515" # forgotten-debug-statement / ruff T100
+  "W1509", # subprocess-popen-preexec-fn / ruff PLW1509
+  "W1510", # subprocess-run-check / ruff PLW1510
+  "W1514", # unspecified-encoding / ruff PLW1514
+  "W1515", # forgotten-debug-statement / ruff T100
+  "W1518", # method-cache-max-size-none / ruff B019
+  "W1641", # eq-without-hash / ruff PLW1641
+  "W2101", # useless-with-lock / ruff PLW2101
+  "W2301", # unnecessary-ellipsis / ruff PLW2301
+  "W2402", # non-ascii-file-name / ruff N999
+  "W2901", # redefined-loop-name / ruff PLW2901
+  "W3201", # bad-dunder-name / ruff PLW3201
+  "W3301" # nested-min-max / ruff PLW3301
 ]
 enable = [
   "useless-suppression" # Identify unneeded pylint disable statements
@@ -282,10 +388,6 @@ ignore = [
   'ARG005', # Unused lambda argument: `args`
   'B006', # Do not use mutable data structures for argument defaults
   'C901', # `_params_row_for_entry` is too complex (11 > 10)
-  'D100', # Missing docstring in public module
-  'D101', # Missing docstring in public class
-  'D102', # Missing docstring in public method
-  'D103', # Missing docstring in public function
   'FBT001', # Boolean positional arg in function definition
   'FBT002', # Boolean default value in function definition
   'FBT003', # Boolean positional value in function call
@@ -328,9 +430,10 @@ lines-between-types = 1 # Separate import/from with 1 line
 [tool.ruff.lint.per-file-ignores]
 "tests/**" = ["SLF001", "S101", "S602"]
 "tests/integration/actions/collections/__init__.py" = ["A005"]
+"src/ansible_navigator/tm_tokenize/*" = ["D100", "D101", "D102", "D103"]
 
 [tool.ruff.lint.pydocstyle]
-convention = "pep257"
+convention = "google"
 
 [tool.setuptools.dynamic]
 dependencies = {file = [".config/requirements.in"]}

pyproject.toml

@@ -80,7 +80,6 @@ def initialize_ui(self, refresh: int) -> None:
         )
 
     def run(self, _screen: Window) -> None:
-        # pylint: disable=protected-access
         """Run the app.
 
         Initialize the UI.

src/ansible_navigator/action_runner.py

@@ -668,7 +668,6 @@ def _get_collection_plugins_details(
         return plugins_details
 
     def _parse_collection_info_stdout(self) -> dict[str, Any]:
-        # pylint: disable=too-many-nested-blocks
         """Parse collection information from catalog collection cache.
 
         Returns:

src/ansible_navigator/actions/collections.py

@@ -149,7 +149,6 @@ def run_stdout(self) -> RunStdoutReturn:
         return RunStdoutReturn(message=error, return_code=return_code)
 
     def _run_runner(self) -> dict[Any, Any] | tuple[str, str, int] | None:
-        # pylint: disable=no-else-return
         """Use the runner subsystem to retrieve the configuration.
 
         Raises:
@@ -214,36 +213,35 @@ def _run_runner(self) -> dict[Any, Any] | tuple[str, str, int] | None:
                 )
             plugin_doc_response = self._extract_plugin_doc(plugin_doc, plugin_doc_err)
             return plugin_doc_response
+        kwargs.update({"host_cwd": str(Path.cwd())})
+        if self._args.execution_environment:
+            ansible_doc_path = "ansible-doc"
         else:
-            kwargs.update({"host_cwd": str(Path.cwd())})
-            if self._args.execution_environment:
-                ansible_doc_path = "ansible-doc"
-            else:
-                exec_path = shutil.which("ansible-doc")
-                if exec_path is None:
-                    msg = "'ansible-doc' executable not found"
-                    self._logger.error(msg)
-                    raise RuntimeError(msg)
-                ansible_doc_path = exec_path
+            exec_path = shutil.which("ansible-doc")
+            if exec_path is None:
+                msg = "'ansible-doc' executable not found"
+                self._logger.error(msg)
+                raise RuntimeError(msg)
+            ansible_doc_path = exec_path
 
-            pass_through_arg = []
-            if self._plugin_name is not C.NOT_SET:
-                pass_through_arg.append(self._plugin_name)
+        pass_through_arg = []
+        if self._plugin_name is not C.NOT_SET:
+            pass_through_arg.append(self._plugin_name)
 
-            if self._plugin_type is not C.NOT_SET:
-                pass_through_arg.extend(["-t", self._plugin_type])
+        if self._plugin_type is not C.NOT_SET:
+            pass_through_arg.extend(["-t", self._plugin_type])
 
-            if self._args.help_doc is True:
-                pass_through_arg.append("--help")
+        if self._args.help_doc is True:
+            pass_through_arg.append("--help")
 
-            if isinstance(self._args.cmdline, list):
-                pass_through_arg.extend(self._args.cmdline)
+        if isinstance(self._args.cmdline, list):
+            pass_through_arg.extend(self._args.cmdline)
 
-            kwargs.update({"cmdline": pass_through_arg})
+        kwargs.update({"cmdline": pass_through_arg})
 
-            self._runner = Command(executable_cmd=ansible_doc_path, **kwargs)
-            stdout_return = self._runner.run()
-            return stdout_return
+        self._runner = Command(executable_cmd=ansible_doc_path, **kwargs)
+        stdout_return = self._runner.run()
+        return stdout_return
 
     def _extract_plugin_doc(
         self,

src/ansible_navigator/actions/doc.py

@@ -385,7 +385,7 @@ def _build_group_menu(self, key: str | None = None) -> Step:
                     menu_entry["__taxonomy"] = taxonomy
                     menu_entry["__type"] = "group"
                     if hosts:
-                        menu_entry.update({c: "" for c in self._show_columns})
+                        menu_entry.update(dict.fromkeys(self._show_columns, ""))
                     menu.append(menu_entry)
 
             return Step(

src/ansible_navigator/actions/inventory.py

@@ -1,5 +1,3 @@
-# noqa: A005
-
 """Menu selection implementation.
 
 Processor of a menu selection from a numeric key press