rpms/pyproject-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

CI: Simplify spec conditionals wrt Fedora 39 going EOL

Browse Source
This commit is contained in:
Miro Hrončok 2024-11-20 13:24:57 +01:00
parent a69fb4e183
commit 665fd2456d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/python-httpbin.spec
View File

@ -10,8 +10,8 @@ BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: pyproject-rpm-macros BuildRequires: pyproject-rpm-macros
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 %if 0%{?rhel} != 9
# Wekrzeug in Fedora 37 isn't compatible with our httpbin # 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 Patch: https://src.fedoraproject.org/rpms/python-httpbin/raw/0e4a7e2812/f/0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch
%endif %endif
@ -61,7 +61,7 @@ sed -Ei 's/\bdef (test_(relative_)?redirect_(to_post|n_(equals_to|higher_than)_1
%if %{with tests} %if %{with tests}
%check %check
%if 0%{?fedora} < 40 && 0%{?rhel} < 10 %if 0%{?rhel} == 9
# this version of httpbin is not compatible with werkzeug 3+ # this version of httpbin is not compatible with werkzeug 3+
%tox %tox
%endif %endif

6
tests/python-setuptools.spec
View File

@ -1,7 +1,7 @@
Name: python-setuptools Name: python-setuptools
# on the CI we test different version of setuptools on different Fedora versions # on the CI we test different version of setuptools on different Fedora versions
# don't package software like this in Fedora please # don't package software like this in Fedora please
%if 0%{?fedora} || 0%{?rhel} >= 10 %if 0%{?rhel} != 9
Version: 67.7.2 Version: 67.7.2
%else %else
Version: 59.6.0 Version: 59.6.0
@ -14,7 +14,7 @@ URL: https://pypi.python.org/pypi/setuptools
Source: %{pypi_source setuptools %{version}} Source: %{pypi_source setuptools %{version}}
# Patch from Fedora proper # 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 Patch: https://src.fedoraproject.org/rpms/python-setuptools/raw/8ae9b2a777c/f/Remove-optional-or-unpackaged-test-deps.patch
%else %else
Patch: https://src.fedoraproject.org/rpms/python-setuptools/raw/6fc093d6b3d/f/0001-Remove-optional-or-unpackaged-test-deps.patch 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 %prep
%autosetup -p1 -n setuptools-%{version} %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: # 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' \ sed -Ei setup.cfg -e '/\bpytest-(checkdocs|black|cov|mypy|enabler)\b/d' \
-e '/\bflake8\b/d' \ -e '/\bflake8\b/d' \

2
tests/python-virtualenv.spec
View File

@ -37,7 +37,7 @@ sed -i -e 's/distlib<1,>=0.3.6/distlib<1,>=0.3.2/' \
# Drop the option for flaky # Drop the option for flaky
sed -i 's/--no-success-flaky-report//' pyproject.toml sed -i 's/--no-success-flaky-report//' pyproject.toml
# Hacky backport of https://src.fedoraproject.org/rpms/python-virtualenv/c/87b1f95664 # 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 sed -i 's/_nonwrappers/_hookimpls/' tests/conftest.py
%endif %endif