Fedora CI: Update pytest so it still builds on Fedora 36 with pluggy 1.0
Related: rhbz#1950291
This commit is contained in:
parent
59e1f5b06a
commit
e269f4d6e9
@ -5,7 +5,7 @@ Name: python-%{pypi_name}
|
|||||||
# because otherwise we would miss some dependencies (pytest 6.2 needs tox 3.20+)
|
# 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.
|
# Please, don't write spec files like this in Fedora, it is forbidden.
|
||||||
%if 0%{?fedora} > 33 || 0%{?rhel} > 9
|
%if 0%{?fedora} > 33 || 0%{?rhel} > 9
|
||||||
Version: 6.2.4
|
Version: 6.2.5
|
||||||
%else
|
%else
|
||||||
Version: 4.4.2
|
Version: 4.4.2
|
||||||
%endif
|
%endif
|
||||||
@ -16,13 +16,6 @@ License: MIT
|
|||||||
URL: https://pytest.org
|
URL: https://pytest.org
|
||||||
Source0: %{pypi_source}
|
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
|
BuildArch: noarch
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: pyproject-rpm-macros
|
BuildRequires: pyproject-rpm-macros
|
||||||
@ -45,11 +38,6 @@ Summary: %{summary}
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{pypi_name}-%{version}
|
%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
|
%generate_buildrequires
|
||||||
%pyproject_buildrequires -x testing -t
|
%pyproject_buildrequires -x testing -t
|
||||||
|
Loading…
Reference in New Issue
Block a user