From 0d427716d30ec46040887821bddcf38e215a4e074ac19e16122c0f6fc6c4310b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Fri, 16 Oct 2020 11:36:32 +0000
Subject: [PATCH] Accepting request 841500 from
 home:bnavigator:branches:devel:languages:python:pytest

- Upper limit pytest 6.1 -- gh#bitprophet/pytest-relaxed#12

Resolve Staging:H blocker

OBS-URL: https://build.opensuse.org/request/show/841500
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-relaxed?expand=0&rev=10
---
 python-pytest-relaxed.changes |  5 +++++
 python-pytest-relaxed.spec    | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/python-pytest-relaxed.changes b/python-pytest-relaxed.changes
index b9d942d..678da5a 100644
--- a/python-pytest-relaxed.changes
+++ b/python-pytest-relaxed.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 13 10:33:07 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Upper limit pytest 6.1 -- gh#bitprophet/pytest-relaxed#12
+
 -------------------------------------------------------------------
 Fri May 15 22:10:39 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 
diff --git a/python-pytest-relaxed.spec b/python-pytest-relaxed.spec
index 0d932f1..3a0016e 100644
--- a/python-pytest-relaxed.spec
+++ b/python-pytest-relaxed.spec
@@ -26,12 +26,13 @@ URL:            https://github.com/bitprophet/pytest-relaxed
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-relaxed/pytest-relaxed-%{version}.tar.gz
 Patch0:         https://github.com/bitprophet/pytest-relaxed/pull/10.patch#/pytest-relaxed-pr10.patch
 BuildRequires:  %{python_module decorator >= 4}
-BuildRequires:  %{python_module pytest >= 3}
+# gh#bitprophet/pytest-relaxed#12
+BuildRequires:  %{python_module pytest < 6.1}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-decorator >= 4
-Requires:       python-pytest >= 3
+Requires:       python-pytest < 6.1
 Requires:       python-six
 BuildArch:      noarch
 %python_subpackages
@@ -43,8 +44,8 @@ Relaxed test discovery/organization plugin for pytest from python-paramiko autho
 %setup -q -n pytest-relaxed-%{version}
 # do not hardcode deps
 sed -i setup.py \
-    -e 's:pytest>=3,<3.3:pytest>=3:g' \
-    -e 's:decorator>=4,<5:decorator>=4:g'
+    -e 's:pytest>=3,<5:pytest>=3:' \
+    -e 's:decorator>=4,<5:decorator>=4:'
 %patch0 -p1
 
 %build
@@ -62,6 +63,7 @@ export LANG=en_US.UTF-8
 %files %{python_files}
 %license LICENSE
 %doc README.rst
-%{python_sitelib}/*
+%{python_sitelib}/pytest_relaxed
+%{python_sitelib}/pytest_relaxed-%{version}*-info
 
 %changelog