Use attrs and @attrs.define in tests

Author: ikonst

docs/source/additional_features.rst

@@ -121,55 +121,54 @@ Type annotations can be added as follows:
 
     import attr
 
-    @attr.s
+    @attrs.define
     class A:
-        one: int = attr.ib()          # Variable annotation (Python 3.6+)
-        two = attr.ib()  # type: int  # Type comment
-        three = attr.ib(type=int)     # type= argument
+        one: int
+        two: int = 7
+        three: int = attrs.field(8)
 
-If you're using ``auto_attribs=True`` you must use variable annotations.
+If you're using ``auto_attribs=False`` you must use ``attrs.field``:
 
 .. code-block:: python
 
-    import attr
+    import attrs
 
-    @attr.s(auto_attribs=True)
+    @attrs.define
     class A:
-        one: int
-        two: int = 7
-        three: int = attr.ib(8)
+        one: int = attrs.field()          # Variable annotation (Python 3.6+)
+        two = attrs.field()  # type: int  # Type comment
+        three = attrs.field(type=int)     # type= argument
 
 Typeshed has a couple of "white lie" annotations to make type checking
-easier. :py:func:`attr.ib` and :py:class:`attr.Factory` actually return objects, but the
+easier. :py:func:`attrs.field` and :py:class:`attrs.Factory` actually return objects, but the
 annotation says these return the types that they expect to be assigned to.
 That enables this to work:
 
 .. code-block:: python
 
-    import attr
-    from typing import Dict
+    import attrs
 
-    @attr.s(auto_attribs=True)
+    @attrs.define
     class A:
-        one: int = attr.ib(8)
-        two: Dict[str, str] = attr.Factory(dict)
-        bad: str = attr.ib(16)   # Error: can't assign int to str
+        one: int = attrs.field(8)
+        two: dict[str, str] = attrs.Factory(dict)
+        bad: str = attrs.field(16)   # Error: can't assign int to str
 
 Caveats/Known Issues
 ====================
 
 * The detection of attr classes and attributes works by function name only.
   This means that if you have your own helper functions that, for example,
-  ``return attr.ib()`` mypy will not see them.
+  ``return attrs.field()`` mypy will not see them.
 
 * All boolean arguments that mypy cares about must be literal ``True`` or ``False``.
   e.g the following will not work:
 
   .. code-block:: python
 
-      import attr
+      import attrs
       YES = True
-      @attr.s(init=YES)
+      @attrs.define(init=YES)
       class A:
           ...
 

mypyc/test-data/run-attrs.test

@@ -1,10 +1,10 @@
 -- Test cases for dataclasses based on the attrs library, where auto_attribs=True
 
 [case testRunAttrsclass]
-import attr
+import attrs
 from typing import Set, List, Callable, Any
 
-@attr.s(auto_attribs=True)
+@attrs.define
 class Person1:
     age : int
     name : str
@@ -18,19 +18,19 @@ def testBool(p: Person1) -> bool:
     else:
         return False
 
-@attr.s(auto_attribs=True)
+@attrs.define
 class Person1b(Person1):
     id: str = '000'
 
-@attr.s(auto_attribs=True)
+@attrs.define
 class Person2:
     age : int
-    name : str = attr.ib(default='robot')
+    name : str = 'robot'
 
-@attr.s(auto_attribs=True, order=True)
+@attrs.define(order=True)
 class Person3:
-    age : int = attr.ib(default = 6)
-    friendIDs : List[int] = attr.ib(factory = list)
+    age : int = attrs.field(default=6)
+    friendIDs : List[int] = attrs.field(factory=list)
 
     def get_age(self) -> int:
         return (self.age)
@@ -49,7 +49,7 @@ def get_next_age(g: Callable[[Any], int]) -> Callable[[Any], int]:
         return g(a) + 1
     return f
 
-@attr.s(auto_attribs=True)
+@attrs.define
 class Person4:
     age : int
     _name : str = 'Bot'
@@ -62,10 +62,10 @@ class Person4:
     def name(self) -> str:
         return self._name
 
-@attr.s(auto_attribs=True)
+@attrs.define
 class Point:
-     x : int = attr.ib(converter=int)
-     y : int = attr.ib(init=False)
+     x : int = attrs.field(converter=int)
+     y : int = attrs.field(init=False)
 
      def __attrs_post_init__(self):
          self.y = self.x + 1
@@ -165,10 +165,10 @@ assert isinstance(Person3().get_age, BuiltinMethodType)
 
 
 [case testRunAttrsclassNonAuto]
-import attr
+import attrs
 from typing import Set, List, Callable, Any
 
-@attr.s
+@attrs.define
 class Person1:
     age = attr.ib(type=int)
     name = attr.ib(type=str)
@@ -182,16 +182,16 @@ def testBool(p: Person1) -> bool:
     else:
         return False
 
-@attr.s
+@attrs.define
 class Person1b(Person1):
     id = attr.ib(type=str, default='000')
 
-@attr.s
+@attrs.define
 class Person2:
     age = attr.ib(type=int)
     name = attr.ib(type=str, default='robot')
 
-@attr.s(order=True)
+@attrs.define(order=True)
 class Person3:
     age = attr.ib(type=int, default=6)
     friendIDs = attr.ib(factory=list, type=List[int])
@@ -213,7 +213,7 @@ def get_next_age(g: Callable[[Any], int]) -> Callable[[Any], int]:
         return g(a) + 1
     return f
 
-@attr.s
+@attrs.define
 class Person4:
     age = attr.ib(type=int)
     _name = attr.ib(type=str, default='Bot')
@@ -226,7 +226,7 @@ class Person4:
     def name(self) -> str:
         return self._name
 
-@attr.s
+@attrs.define
 class Point:
      x = attr.ib(type=int, converter=int)
      y = attr.ib(type=int, init=False)

test-data/unit/check-flags.test

@@ -1305,32 +1305,32 @@ main:3: error: Function is missing a type annotation for one or more arguments
 
 [case testDisallowIncompleteDefsAttrsNoAnnotations]
 # flags: --disallow-incomplete-defs
-import attr
+import attrs
 
-@attr.s()
+@attrs.define
 class Unannotated:
-    foo = attr.ib()
+    foo = attrs.field()
 
 [builtins fixtures/plugin_attrs.pyi]
 
 [case testDisallowIncompleteDefsAttrsWithAnnotations]
 # flags: --disallow-incomplete-defs
-import attr
+import attrs
 
-@attr.s()
+@attrs.define
 class Annotated:
-    bar: int = attr.ib()
+    bar: int = attrs.field()
 
 [builtins fixtures/plugin_attrs.pyi]
 
 [case testDisallowIncompleteDefsAttrsPartialAnnotations]
 # flags: --disallow-incomplete-defs
-import attr
+import attrs
 
-@attr.s()
+@attrs.define
 class PartiallyAnnotated:  # E: Function is missing a type annotation for one or more arguments
-    bar: int = attr.ib()
-    baz = attr.ib()
+    bar: int = attrs.field()
+    baz = attrs.field()
 
 [builtins fixtures/plugin_attrs.pyi]