From 6bbba680f4ea4bc12a8f8389b8bc85ae07779806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 9 Sep 2021 12:12:13 +0200
Subject: [PATCH] Fedora CI: Update pytest so it still builds on Fedora 36 with
 pluggy 1.0

---
 tests/python-pytest.spec | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/tests/python-pytest.spec b/tests/python-pytest.spec
index 5163a4a..87cbcc2 100644
--- a/tests/python-pytest.spec
+++ b/tests/python-pytest.spec
@@ -5,7 +5,7 @@ Name:           python-%{pypi_name}
 # because otherwise we would miss some dependencies (pytest 6.2 needs tox 3.20+)
 # Please, don't write spec files like this in Fedora, it is forbidden.
 %if 0%{?fedora} > 33 || 0%{?rhel} > 9
-Version:        6.2.4
+Version:        6.2.5
 %else
 Version:        4.4.2
 %endif
@@ -16,13 +16,6 @@ License:        MIT
 URL:            https://pytest.org
 Source0:        %{pypi_source}
 
-%if v"%{version}" >= v"6.2"
-# Fix Python 3.10 test issues
-# Merged upstream, https://github.com/pytest-dev/pytest/pull/8555
-# Rebased slightly
-Patch2:         https://src.fedoraproject.org/rpms/pytest/raw/cad86f73367eff59a1d6daff44d262c3852f01f9/f/8555.patch
-%endif
-
 BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  pyproject-rpm-macros
@@ -45,11 +38,6 @@ Summary:        %{summary}
 %prep
 %autosetup -p1 -n %{pypi_name}-%{version}
 
-# Remove duplicate '>=' in setup.cfg
-# https://github.com/pytest-dev/pytest/pull/8336
-# https://github.com/pytest-dev/pytest/pull/8774
-sed -i 's/>=>=/>=/' setup.cfg
-
 
 %generate_buildrequires
 %pyproject_buildrequires -x testing -t