From 7bea32fd382fe993229cd2db29c3a13cb8138b09 Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Tue, 09 Apr 2024 22:50:43 +0200 Subject: [PATCH] libarchive: update to 3.7.3 --- components/python/pytest-ignore-flaky/python-integrate-project.conf | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/components/python/pytest-ignore-flaky/python-integrate-project.conf b/components/python/pytest-ignore-flaky/python-integrate-project.conf index f8659e5..dfbf803 100644 --- a/components/python/pytest-ignore-flaky/python-integrate-project.conf +++ b/components/python/pytest-ignore-flaky/python-integrate-project.conf @@ -14,3 +14,12 @@ # %patch% 01-pytest-disable-plugins.patch + +%include-3% +# https://github.com/pytest-dev/pytest/issues/12186 +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-checkdocs +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-console-scripts +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-ignore-flaky +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-randomly +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-salt-factories +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-system-statistics -- Gitblit v1.9.3