Skip to content

Commit

Permalink
python-avocado.spec: remove markupsafe version pinning on Fedora 42
Browse files Browse the repository at this point in the history
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 <crosa@redhat.com>
  • Loading branch information
clebergnu committed Nov 28, 2024
1 parent 22d647a commit 8f006bc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 5 additions & 1 deletion optional_plugins/html/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions python-avocado.spec
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,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
Expand Down

0 comments on commit 8f006bc

Please sign in to comment.