Hello community, here is the log from the commit of package python-pytest3 for openSUSE:Factory checked in at 2019-10-14 14:52:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest3 (Old) and /work/SRC/openSUSE:Factory/.python-pytest3.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest3" Mon Oct 14 14:52:30 2019 rev:4 rq:737402 version:3.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest3/python-pytest3.changes 2019-09-30 15:53:29.914158777 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytest3.new.2352/python-pytest3.changes 2019-10-14 14:52:31.570289424 +0200 @@ -1,0 +2,5 @@ +Fri Oct 11 08:11:46 UTC 2019 - Ondřej Súkup <[email protected]> + +- add attrs.patch - fix compatibility with attrs-19.2+ + +------------------------------------------------------------------- New: ---- attrs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest3.spec ++++++ --- /var/tmp/diff_new_pack.sC0lsq/_old 2019-10-14 14:52:32.194287797 +0200 +++ /var/tmp/diff_new_pack.sC0lsq/_new 2019-10-14 14:52:32.194287797 +0200 @@ -43,6 +43,8 @@ Patch3: importlib-metadata.patch # PATCH-FIX-UPSTREAM from master Patch4: importlib-py38.patch +# PATCH-FIX-UPSTREAM from master +Patch5: attrs.patch BuildRequires: %{python_module setuptools >= 40.0} BuildRequires: %{python_module setuptools_scm} BuildRequires: fdupes ++++++ attrs.patch ++++++ Index: pytest-3.10.1/src/_pytest/compat.py =================================================================== --- pytest-3.10.1.orig/src/_pytest/compat.py +++ pytest-3.10.1/src/_pytest/compat.py @@ -12,6 +12,7 @@ import re import sys from contextlib import contextmanager +import attr import py import six from six import text_type @@ -447,3 +448,8 @@ if six.PY2: else: from functools import lru_cache # noqa: F401 + +if getattr(attr, "__version_info__", ()) >= (19, 2): + ATTRS_EQ_FIELD = "eq" +else: + ATTRS_EQ_FIELD = "cmp" Index: pytest-3.10.1/src/_pytest/mark/structures.py =================================================================== --- pytest-3.10.1.orig/src/_pytest/mark/structures.py +++ pytest-3.10.1/src/_pytest/mark/structures.py @@ -10,6 +10,7 @@ from six.moves import map from ..compat import getfslineno from ..compat import MappingMixin from ..compat import NOTSET +from ..compat import ATTRS_EQ_FIELD from ..deprecated import MARK_INFO_ATTRIBUTE from ..deprecated import MARK_PARAMETERSET_UNPACKING from _pytest.outcomes import fail @@ -440,7 +441,8 @@ class NodeKeywords(MappingMixin): return "<NodeKeywords for node %s>" % (self.node,) [email protected](cmp=False, hash=False) +# mypy cannot find this overload, remove when on attrs>=19.2 [email protected](hash=False, **{ATTRS_EQ_FIELD: False}) # type: ignore class NodeMarkers(object): """ internal structure for storing marks belonging to a node
