From b65d030a058ce44bd03be4b19c887836a20f5f2f16092e7b3064e83d35810136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 21 Nov 2018 13:03:29 +0000
Subject: [PATCH] Accepting request 650653 from
 home:scarabeus_iv:branches:devel:languages:python

- Add patch to work with new pytest:
  * sybil-pytest4.patch

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

diff --git a/python-sybil.changes b/python-sybil.changes
index e530979..3f7ac13 100644
--- a/python-sybil.changes
+++ b/python-sybil.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 21 13:01:18 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to work with new pytest:
+  * sybil-pytest4.patch
+
 -------------------------------------------------------------------
 Wed Aug 29 11:07:06 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-sybil.spec b/python-sybil.spec
index e666197..ee4c88c 100644
--- a/python-sybil.spec
+++ b/python-sybil.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,6 +25,7 @@ License:        MIT
 Group:          Development/Languages/Python
 Url:            https://github.com/cjw296/sybil
 Source:         https://files.pythonhosted.org/packages/source/s/sybil/sybil-%{version}.tar.gz
+Patch0:         sybil-pytest4.patch
 BuildRequires:  %{python_module Sphinx}
 BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module pkginfo}
@@ -57,6 +58,7 @@ test runners.
 
 %prep
 %setup -q -n sybil-%{version}
+%patch0 -p1
 
 %build
 %python_build
diff --git a/sybil-pytest4.patch b/sybil-pytest4.patch
new file mode 100644
index 0000000..2aeb66b
--- /dev/null
+++ b/sybil-pytest4.patch
@@ -0,0 +1,22 @@
+From 6461d8156cfb68bd073ec613a5a516916e97e549 Mon Sep 17 00:00:00 2001
+From: Chris Withers <chris@simplistix.co.uk>
+Date: Wed, 17 Oct 2018 11:57:55 +0100
+Subject: [PATCH] fix for latest pytest release
+
+---
+ tests/test_functional.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_functional.py b/tests/test_functional.py
+index 9eb5509..ccce93d 100644
+--- a/tests/test_functional.py
++++ b/tests/test_functional.py
+@@ -27,7 +27,7 @@ def pytest_sessionfinish(self, session):
+             self.session = session
+ 
+     results = CollectResults()
+-    return_code = pytest_main(['-vs', join(functional_test_dir, 'pytest')],
++    return_code = pytest_main(['-vvs', join(functional_test_dir, 'pytest')],
+                               plugins=[results])
+     assert return_code == 1
+     assert results.session.testsfailed == 4