From f2bf99a1914d7fca8b1ff4e0ea096942b16812a72e76a74982c2e1443d6728af Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 7 Feb 2024 09:01:14 +0000
Subject: [PATCH] - avoid cycle with pytest-skip-markers by separating   test
 into a :test buildflavor

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-shell-utilities?expand=0&rev=8
---
 _multibuild                           |  3 +++
 python-pytest-shell-utilities.changes |  6 ++++++
 python-pytest-shell-utilities.spec    | 26 ++++++++++++++++++++------
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 _multibuild

diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
diff --git a/python-pytest-shell-utilities.changes b/python-pytest-shell-utilities.changes
index 13c9462..dc7db8b 100644
--- a/python-pytest-shell-utilities.changes
+++ b/python-pytest-shell-utilities.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  7 09:00:37 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- avoid cycle with pytest-skip-markers by separating
+  test into a :test buildflavor
+
 -------------------------------------------------------------------
 Wed Jan 24 13:39:40 UTC 2024 - ecsos <ecsos@opensuse.org>
 
diff --git a/python-pytest-shell-utilities.spec b/python-pytest-shell-utilities.spec
index fe05b1e..7c6d66b 100644
--- a/python-pytest-shell-utilities.spec
+++ b/python-pytest-shell-utilities.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pytest-shell-utilities
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,16 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
 %{?sle15_python_module_pythons}
-Name:           python-pytest-shell-utilities
+Name:           python-pytest-shell-utilities%{psuffix}
 Version:        1.8.0
 Release:        0
 Summary:        Pytest plugin to simplify running shell commands against the system
@@ -26,19 +34,21 @@ URL:            https://github.com/saltstack/pytest-shell-utilities
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-shell-utilities/pytest-shell-utilities-%{version}.tar.gz
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools >= 50.3.2}
-BuildRequires:  %{python_module setuptools-declarative-requirements}
 BuildRequires:  %{python_module setuptools_scm >= 3.4}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  python-rpm-macros
 # SECTION test requirements
+%if %{with test}
 BuildRequires:  %{python_module attrs >= 22.1.0}
 BuildRequires:  %{python_module psutil >= 5.0.0}
 BuildRequires:  %{python_module pytest >= 7.3.0}
 BuildRequires:  %{python_module pytest-helpers-namespace}
+BuildRequires:  %{python_module pytest-shell-utilities = %{version}}
 BuildRequires:  %{python_module pytest-skip-markers}
 BuildRequires:  %{python_module pytest-subtests}
 BuildRequires:  %{python_module typing-extensions}
+%endif
 # /SECTION
 BuildRequires:  fdupes
 Requires:       python-attrs >= 22.1.0
@@ -59,17 +69,21 @@ Pytest plugin to simplify running shell commands against the system
 %build
 %pyproject_wheel
 
+%if !%{with test}
 %install
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%check
-%pytest
-
 %files %{python_files}
 %doc CHANGELOG.rst README.rst
 %license LICENSE
 %{python_sitelib}/pytestshellutils
 %{python_sitelib}/pytest_shell_utilities-%{version}*-info
 
+%else
+
+%check
+%pytest
+%endif
+
 %changelog