From 634bc1a31a3fed8aac91d45a8824e2802de6c384 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Thu, 10 Oct 2024 09:49:28 +0200 Subject: [PATCH 1/2] MarkupSafe requirement for html plugin This adds markupsafe<3.0.0 requirements to html plugin, because markupsafe-3.0.0 can't be installed with older versions of setuptools on RHEL9 and other systems because of `CCompilerError`. We need to add the same requirement to `ansible` plugin, because it would try to install markupsafe-3.0.0 Reference: #6038 Signed-off-by: Jan Richter --- optional_plugins/ansible/setup.py | 1 + optional_plugins/html/setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/optional_plugins/ansible/setup.py b/optional_plugins/ansible/setup.py index e41d2ca55f..e61fe7823b 100644 --- a/optional_plugins/ansible/setup.py +++ b/optional_plugins/ansible/setup.py @@ -41,6 +41,7 @@ "cffi", "pycparser", "ansible-core", + "markupsafe<3.0.0", ], test_suite="tests", entry_points={ diff --git a/optional_plugins/html/setup.py b/optional_plugins/html/setup.py index ee9933d241..5d594cd51a 100644 --- a/optional_plugins/html/setup.py +++ b/optional_plugins/html/setup.py @@ -39,7 +39,7 @@ def get_long_description(): url="http://avocado-framework.github.io/", packages=find_packages(), include_package_data=True, - install_requires=[f"avocado-framework=={VERSION}", "jinja2"], + install_requires=[f"avocado-framework=={VERSION}", "jinja2", "markupsafe<3.0.0"], entry_points={ "avocado.plugins.cli": [ "html = avocado_result_html:HTML", From 2810b11dde001640c1313b9daad469ac6d8f2b51 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Thu, 10 Oct 2024 09:58:00 +0200 Subject: [PATCH 2/2] Release 108 notes typo fixes Signed-off-by: Jan Richter --- docs/source/releases/108_0.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/releases/108_0.rst b/docs/source/releases/108_0.rst index dbf2e8876b..ede5572861 100644 --- a/docs/source/releases/108_0.rst +++ b/docs/source/releases/108_0.rst @@ -15,10 +15,10 @@ Users/Test Writers `exec-runnables-recipe`. It allows a user to point to a file that will be executed, and that is expected to generate (on its ``STDOUT``) content compatible with the Runnable recipe format. More info - abotu this new featrue can be found in `documentaion + about this new featrue can be found in `documentaion `_ -* Documentaion about avocado-instrumented test lifecycle has been `improved +* Documentation about avocado-instrumented test lifecycle has been `improved `_ Utility Modules