Hello community,

here is the log from the commit of package python-chardet for openSUSE:Factory 
checked in at 2019-07-05 13:48:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-chardet (Old)
 and      /work/SRC/openSUSE:Factory/.python-chardet.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-chardet"

Fri Jul  5 13:48:16 2019 rev:26 rq:713178 version:3.0.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-chardet/python-chardet.changes    
2019-02-26 22:16:08.674196156 +0100
+++ /work/SRC/openSUSE:Factory/.python-chardet.new.4615/python-chardet.changes  
2019-07-05 13:48:17.329413582 +0200
@@ -1,0 +2,6 @@
+Wed Jul  3 08:32:17 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Add patch to fix build with pytest4:
+  * pytest4.patch
+
+-------------------------------------------------------------------

New:
----
  pytest4.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-chardet.spec ++++++
--- /var/tmp/diff_new_pack.RV8rtD/_old  2019-07-05 13:48:17.945414532 +0200
+++ /var/tmp/diff_new_pack.RV8rtD/_new  2019-07-05 13:48:17.949414538 +0200
@@ -34,6 +34,7 @@
 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 @@
 
 %prep
 %setup -q -n chardet-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -92,7 +94,7 @@
 
 %check
 %if %{with test}
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} 
py.test-%{$python_version} test.py
+%pytest test.py
 %endif
 
 %if !%{with test}

++++++ pytest4.patch ++++++
>From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <m...@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
 
 

Reply via email to