p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3228 from thisch/update_attr 

Update minimal attrs library to v17.4.0
This commit is contained in:
Bruno Oliveira 2018-02-17 20:19:07 -02:00 committed by GitHub
parent f263932883 81fa547fa8
commit 3bc8b50a0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/fixtures.py
View File

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

1
changelog/3228.trivial.rst Normal file
View File

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

2
setup.py
View File

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