From 3df02058fb3d48a999bbc8d5d56c2910fbc249a4 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 24 Mar 2024 23:37:14 +0100
Subject: [PATCH] meld: update to 3.22.2

---
 components/python/typeguard/python-integrate-project.conf |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/components/python/typeguard/python-integrate-project.conf b/components/python/typeguard/python-integrate-project.conf
new file mode 100644
index 0000000..58a92c1
--- /dev/null
+++ b/components/python/typeguard/python-integrate-project.conf
@@ -0,0 +1,21 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2024 Marcel Telka
+#
+
+%patch% 01-pytest-indirectly.patch
+
+%include-3%
+# https://github.com/pytest-dev/pluggy/issues/457
+TEST_CONFLICTING_PACKAGES.python += library/python/pytest-enabler
+TEST_CONFLICTING_PACKAGES.python += library/python/pytest-randomly

--
Gitblit v1.9.3