Skip to content

Commit

Permalink
Only pin markupsafe on s390x
Browse files Browse the repository at this point in the history
Commit 634bc1a pinned the markupsafe because of installations on
s390x only.  It makes sense to limit the pinning to s390x then.

That in itself would be simple enough, but, 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.

Reference: #6038
Signed-off-by: Cleber Rosa <[email protected]>
  • Loading branch information
clebergnu committed Nov 27, 2024
1 parent 5b65f4f commit 25dfef9
Show file tree
Hide file tree
Showing 2 changed files with 8 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 ; platform_machine == 's390x'",
],
entry_points={
"avocado.plugins.cli": [
"html = avocado_result_html:HTML",
Expand Down
3 changes: 3 additions & 0 deletions python-avocado.spec
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ 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
%endif
%py3_build
pushd optional_plugins/html
%py3_build
Expand Down

0 comments on commit 25dfef9

Please sign in to comment.