From 4cecf06ccb82d5cdabd1bae98ffca56eb85eabe0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 11 May 2023 22:54:29 +0000 Subject: [PATCH] tests: remove pytest-forked req with core 2.16 ansible-test units doesn't depend on pytest-forked as of https://github.com/ansible/ansible/commit/676b731e6f7d60ce6fd48c0d1c883fc85f5c6537. This is expected to land in ansible-core 2.16. --- ansible-packaging.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 1a5ec61..e1b9a1f 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -48,7 +48,7 @@ Requires: /usr/bin/ansible-test Requires: %{py3_dist pytest} Requires: %{py3_dist pytest-mock} Requires: %{py3_dist pytest-xdist} -Requires: %{py3_dist pytest-forked} +Requires: (%{py3_dist pytest-forked} if ansible-core < 2.16~~) Requires: %{py3_dist pyyaml} # mock is included in the list upstream, but is deprecated in Fedora. # Maintainers should work with upstream to add compat code to support @@ -151,6 +151,7 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %changelog * Thu May 11 2023 Maxwell G - 1-10 - %%ansible_collection_install - disable spurious collections path warnings +- ansible-packaging-tests - don't depend on pytest-forked with ansible-core 2.16 * Wed Jan 18 2023 Fedora Release Engineering - 1-9.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild