From 8cdd197ba643eb2608c5aab87567625bb9336cee Mon Sep 17 00:00:00 2001
From: David Stes <55844484+cstes@users.noreply.github.com>
Date: Sun, 31 Mar 2024 18:41:25 +0200
Subject: [PATCH] opensmalltalk cog-spur: update to 5.0.3356

---
 components/python/pytest-relaxed/Makefile |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/python/pytest-relaxed/Makefile b/components/python/pytest-relaxed/Makefile
index f2c2094..e191e3b 100644
--- a/components/python/pytest-relaxed/Makefile
+++ b/components/python/pytest-relaxed/Makefile
@@ -19,14 +19,13 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =		pytest-relaxed
-HUMAN_VERSION =			2.0.1
-COMPONENT_REVISION =		1
+HUMAN_VERSION =			2.0.2
 COMPONENT_SUMMARY =		pytest-relaxed - Relaxed test discovery/organization for pytest
 COMPONENT_PROJECT_URL =		https://pytest-relaxed.readthedocs.io/
 COMPONENT_ARCHIVE_URL =		\
 	https://github.com/bitprophet/pytest-relaxed/archive/refs/tags/$(HUMAN_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH =	\
-	sha256:caf4a7da34e922c0cd26fbf37b9aca1bc099a02668bcf83ebf6fe6717687e844
+	sha256:aba10bf2dd25ef25b0a6e116e5ee10e43852fe285f66a4092984c87cbfcf5b18
 COMPONENT_LICENSE =		BSD-2-Clause
 COMPONENT_LICENSE_FILE =	LICENSE
 
@@ -34,6 +33,15 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
+# https://github.com/pytest-dev/pluggy/issues/457
+TEST_CONFLICTING_PACKAGES.python += library/python/pytest-checkdocs
+TEST_CONFLICTING_PACKAGES.python += library/python/pytest-console-scripts
+TEST_CONFLICTING_PACKAGES.python += library/python/pytest-enabler
+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
+TEST_CONFLICTING_PACKAGES.python += library/python/typeguard
+
 # Auto-generated dependencies
 PYTHON_REQUIRED_PACKAGES += library/python/decorator
 PYTHON_REQUIRED_PACKAGES += library/python/pytest

--
Gitblit v1.9.3