Merge pull request #3228 from thisch/update_attr

Update minimal attrs library to v17.4.0

_pytest/fixtures.py

@@ -839,9 +839,9 @@ def _ensure_immutable_ids(ids):
 @attr.s(frozen=True)
 class FixtureFunctionMarker(object):
     scope = attr.ib()
-    params = attr.ib(convert=attr.converters.optional(tuple))
+    params = attr.ib(converter=attr.converters.optional(tuple))
     autouse = attr.ib(default=False)
-    ids = attr.ib(default=None, convert=_ensure_immutable_ids)
+    ids = attr.ib(default=None, converter=_ensure_immutable_ids)
     name = attr.ib(default=None)
 
     def __call__(self, function):

changelog/3228.trivial.rst

@@ -0,0 +1 @@
+Change minimum requirement of ``attrs`` to ``17.4.0``.

setup.py

@@ -59,7 +59,7 @@ def main():
         'py>=1.5.0',
         'six>=1.10.0',
         'setuptools',
-        'attrs>=17.2.0',
+        'attrs>=17.4.0',
     ]
     # if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy;
     # used by tox.ini to test with pluggy master