From b80f298cd4bef4c93e367af630b4660ccce504a2 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Wed, 27 Nov 2024 16:11:50 -0500 Subject: [PATCH] python-avocado.spec: remove markupsafe version pinning on Fedora 42 During RPM builds on Fedora 42 (really rawhide at this time), the RPM package dependency system provides MarkupSafe > 3.0.0 (currently 3.0.2). So, we remove the pinning, or else, the build would fail due to a version requirement conflict. Signed-off-by: Cleber Rosa --- optional_plugins/html/setup.py | 6 +++++- python-avocado.spec | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/optional_plugins/html/setup.py b/optional_plugins/html/setup.py index 5d594cd51a..afe89cff03 100644 --- a/optional_plugins/html/setup.py +++ b/optional_plugins/html/setup.py @@ -39,7 +39,11 @@ def get_long_description(): url="http://avocado-framework.github.io/", packages=find_packages(), include_package_data=True, - install_requires=[f"avocado-framework=={VERSION}", "jinja2", "markupsafe<3.0.0"], + install_requires=[ + f"avocado-framework=={VERSION}", + "jinja2", + "markupsafe<3.0.0", + ], entry_points={ "avocado.plugins.cli": [ "html = avocado_result_html:HTML", diff --git a/python-avocado.spec b/python-avocado.spec index b23d6f6ce8..e3dfeccce8 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -104,6 +104,10 @@ these days a framework) to perform automated testing. %if 0%{?rhel} sed -e 's/"PyYAML>=4.2b2"/"PyYAML>=3.12"/' -i optional_plugins/varianter_yaml_to_mux/setup.py %endif +%if 0%{?fedora} >= 42 +sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/html/setup.py +sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/ansible/setup.py +%endif %py3_build pushd optional_plugins/html %py3_build