diff --git a/tests/python-httpbin.spec b/tests/python-httpbin.spec index de0618f..dbc8963 100644 --- a/tests/python-httpbin.spec +++ b/tests/python-httpbin.spec @@ -10,8 +10,8 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: pyproject-rpm-macros -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 -# Wekrzeug in Fedora 37 isn't compatible with our httpbin +%if 0%{?rhel} != 9 +# Wekrzeug in Fedora and EL10+ isn't compatible with our httpbin Patch: https://src.fedoraproject.org/rpms/python-httpbin/raw/0e4a7e2812/f/0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch %endif @@ -61,7 +61,7 @@ sed -Ei 's/\bdef (test_(relative_)?redirect_(to_post|n_(equals_to|higher_than)_1 %if %{with tests} %check -%if 0%{?fedora} < 40 && 0%{?rhel} < 10 +%if 0%{?rhel} == 9 # this version of httpbin is not compatible with werkzeug 3+ %tox %endif diff --git a/tests/python-setuptools.spec b/tests/python-setuptools.spec index 76f11aa..4203c3d 100644 --- a/tests/python-setuptools.spec +++ b/tests/python-setuptools.spec @@ -1,7 +1,7 @@ Name: python-setuptools # on the CI we test different version of setuptools on different Fedora versions # don't package software like this in Fedora please -%if 0%{?fedora} || 0%{?rhel} >= 10 +%if 0%{?rhel} != 9 Version: 67.7.2 %else Version: 59.6.0 @@ -14,7 +14,7 @@ URL: https://pypi.python.org/pypi/setuptools Source: %{pypi_source setuptools %{version}} # Patch from Fedora proper -%if 0%{?fedora} || 0%{?rhel} >= 10 +%if 0%{?rhel} != 9 Patch: https://src.fedoraproject.org/rpms/python-setuptools/raw/8ae9b2a777c/f/Remove-optional-or-unpackaged-test-deps.patch %else Patch: https://src.fedoraproject.org/rpms/python-setuptools/raw/6fc093d6b3d/f/0001-Remove-optional-or-unpackaged-test-deps.patch @@ -54,7 +54,7 @@ Summary: %{summary} %prep %autosetup -p1 -n setuptools-%{version} -%if 0%{?rhel} && 0%{?rhel} < 10 +%if 0%{?rhel} == 9 # The following test deps are optional and either not desired or not available in Fedora: sed -Ei setup.cfg -e '/\bpytest-(checkdocs|black|cov|mypy|enabler)\b/d' \ -e '/\bflake8\b/d' \ diff --git a/tests/python-virtualenv.spec b/tests/python-virtualenv.spec index add7f78..39df3b2 100644 --- a/tests/python-virtualenv.spec +++ b/tests/python-virtualenv.spec @@ -37,7 +37,7 @@ sed -i -e 's/distlib<1,>=0.3.6/distlib<1,>=0.3.2/' \ # Drop the option for flaky sed -i 's/--no-success-flaky-report//' pyproject.toml # Hacky backport of https://src.fedoraproject.org/rpms/python-virtualenv/c/87b1f95664 -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +%if 0%{?rhel} != 9 sed -i 's/_nonwrappers/_hookimpls/' tests/conftest.py %endif