Update Ruff

Author: hynek

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

pyproject.toml

@@ -213,7 +213,7 @@ ignore = [
   "PLW0603", # sometimes we need globals
   "S307",    # eval FTW
   "SLF001",  # private members are accessed by friendly functions
-  "TCH",     # TYPE_CHECKING blocks break autodocs
+  "TC",      # TYPE_CHECKING blocks break autodocs
   "TD",      # we don't follow other people's todo style
   "TRY301",  # I'm sorry, but this makes not sense for us.
   "UP031",   # format() is slow as molasses; % and f'' FTW.

src/attr/__init__.py

@@ -37,11 +37,11 @@ class AttrsInstance(Protocol):
 
 
 __all__ = [
+    "NOTHING",
     "Attribute",
     "AttrsInstance",
     "Converter",
     "Factory",
-    "NOTHING",
     "asdict",
     "assoc",
     "astuple",

src/attr/_config.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 
-__all__ = ["set_run_validators", "get_run_validators"]
+__all__ = ["get_run_validators", "set_run_validators"]
 
 _run_validators = True
 

src/attr/_make.py

@@ -578,15 +578,15 @@ class _ClassBuilder:
         "_cls_dict",
         "_delete_attribs",
         "_frozen",
-        "_has_pre_init",
-        "_pre_init_has_args",
+        "_has_custom_setattr",
         "_has_post_init",
+        "_has_pre_init",
         "_is_exc",
         "_on_setattr",
+        "_pre_init_has_args",
         "_slots",
         "_weakref_slot",
         "_wrote_own_setattr",
-        "_has_custom_setattr",
     )
 
     def __init__(
@@ -2276,7 +2276,9 @@ class Attribute:
     For the full version history of the fields, see `attr.ib`.
     """
 
-    __slots__ = (
+    # These slots must NOT be reordered because we use them later for
+    # instantiation.
+    __slots__ = (  # noqa: RUF023
         "name",
         "default",
         "validator",
@@ -2470,22 +2472,22 @@ class _CountingAttr:
     """
 
     __slots__ = (
-        "counter",
         "_default",
-        "repr",
+        "_validator",
+        "alias",
+        "converter",
+        "counter",
         "eq",
         "eq_key",
-        "order",
-        "order_key",
         "hash",
         "init",
-        "metadata",
-        "_validator",
-        "converter",
-        "type",
         "kw_only",
+        "metadata",
         "on_setattr",
-        "alias",
+        "order",
+        "order_key",
+        "repr",
+        "type",
     )
     __attrs_attrs__ = (
         *tuple(
@@ -2691,12 +2693,12 @@ class Converter:
     """
 
     __slots__ = (
-        "converter",
-        "takes_self",
-        "takes_field",
+        "__call__",
         "_first_param_type",
         "_global_name",
-        "__call__",
+        "converter",
+        "takes_field",
+        "takes_self",
     )
 
     def __init__(self, converter, *, takes_self=False, takes_field=False):

src/attr/validators.py

@@ -172,7 +172,7 @@ def matches_re(regex, flags=0, func=None):
     if func not in valid_funcs:
         msg = "'func' must be one of {}.".format(
             ", ".join(
-                sorted(e and e.__name__ or "None" for e in set(valid_funcs))
+                sorted((e and e.__name__) or "None" for e in set(valid_funcs))
             )
         )
         raise ValueError(msg)

src/attrs/__init__.py

@@ -27,6 +27,11 @@
 
 
 __all__ = [
+    "NOTHING",
+    "Attribute",
+    "AttrsInstance",
+    "Converter",
+    "Factory",
     "__author__",
     "__copyright__",
     "__description__",
@@ -40,24 +45,19 @@
     "asdict",
     "assoc",
     "astuple",
-    "Attribute",
-    "AttrsInstance",
     "cmp_using",
-    "Converter",
     "converters",
     "define",
     "evolve",
     "exceptions",
-    "Factory",
     "field",
-    "fields_dict",
     "fields",
+    "fields_dict",
     "filters",
     "frozen",
     "has",
     "make_class",
     "mutable",
-    "NOTHING",
     "resolve_types",
     "setters",
     "validate",