From df52f6684637cb86c73117abd3443294577e3c4fac4f2befbe83f5f37d5db3c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 3 Jul 2019 08:32:32 +0000
Subject: [PATCH] - Add patch to fix build with pytest4:   * pytest4.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-chardet?expand=0&rev=43
---
 pytest4.patch          | 23 +++++++++++++++++++++++
 python-chardet.changes |  6 ++++++
 python-chardet.spec    |  4 +++-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pytest4.patch

diff --git a/pytest4.patch b/pytest4.patch
new file mode 100644
index 0000000..1059b07
--- /dev/null
+++ b/pytest4.patch
@@ -0,0 +1,23 @@
+From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 12 Mar 2019 18:44:36 +0100
+Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
+
+Fixes https://github.com/chardet/chardet/issues/173
+---
+ test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test.py b/test.py
+index 9833307..ad2b753 100644
+--- a/test.py
++++ b/test.py
+@@ -59,7 +59,7 @@ def gen_test_params():
+             full_path = join(path, file_name)
+             test_case = full_path, encoding
+             if full_path in EXPECTED_FAILURES:
+-                test_case = pytest.mark.xfail(test_case)
++                test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
+             yield test_case
+ 
+ 
diff --git a/python-chardet.changes b/python-chardet.changes
index e243c2a..64f469d 100644
--- a/python-chardet.changes
+++ b/python-chardet.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  3 08:32:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to fix build with pytest4:
+  * pytest4.patch
+
 -------------------------------------------------------------------
 Tue Feb 26 08:14:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-chardet.spec b/python-chardet.spec
index ff36eb7..b011352 100644
--- a/python-chardet.spec
+++ b/python-chardet.spec
@@ -34,6 +34,7 @@ Group:          Development/Languages/Python
 URL:            https://github.com/chardet/chardet
 Source0:        https://files.pythonhosted.org/packages/source/c/chardet/chardet-%{version}.tar.gz
 Source1:        python-chardet-rpmlintrc
+Patch0:         pytest4.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -77,6 +78,7 @@ or more files::
 
 %prep
 %setup -q -n chardet-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -92,7 +94,7 @@ mv %{buildroot}%{_bindir}/chardetect %{buildroot}%{_bindir}/chardetect-%{$python
 
 %check
 %if %{with test}
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} test.py
+%pytest test.py
 %endif
 
 %if !%{with test}