Skip to content

Commit 8f006bc

Browse files
committed
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 <[email protected]>
1 parent 22d647a commit 8f006bc

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

optional_plugins/html/setup.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ def get_long_description():
3939
url="http://avocado-framework.github.io/",
4040
packages=find_packages(),
4141
include_package_data=True,
42-
install_requires=[f"avocado-framework=={VERSION}", "jinja2", "markupsafe<3.0.0"],
42+
install_requires=[
43+
f"avocado-framework=={VERSION}",
44+
"jinja2",
45+
"markupsafe<3.0.0",
46+
],
4347
entry_points={
4448
"avocado.plugins.cli": [
4549
"html = avocado_result_html:HTML",

python-avocado.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ these days a framework) to perform automated testing.
103103
%if 0%{?rhel}
104104
sed -e 's/"PyYAML>=4.2b2"/"PyYAML>=3.12"/' -i optional_plugins/varianter_yaml_to_mux/setup.py
105105
%endif
106+
%if 0%{?fedora} >= 42
107+
sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/html/setup.py
108+
sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/ansible/setup.py
109+
%endif
106110
%py3_build
107111
pushd optional_plugins/html
108112
%py3_build

0 commit comments

Comments
 (0)