From 82cdc487cefbbbd1848705427fed6276461835e6 Mon Sep 17 00:00:00 2001 From: Thomas Hisch Date: Thu, 15 Feb 2018 21:09:44 +0100 Subject: [PATCH] Fix raised warning when attrs 17.4.0 is used Related: #3223 --- _pytest/fixtures.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py index 2bc6f108b..27ecf37da 100644 --- a/_pytest/fixtures.py +++ b/_pytest/fixtures.py @@ -831,9 +831,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): diff --git a/setup.py b/setup.py index e08be845e..dcfac37c5 100644 --- a/setup.py +++ b/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