From cc15860ccfa296227ecb7306ac586902121fe642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 13 Nov 2024 13:59:59 +0100
Subject: [PATCH] Fix one remaining test for setuptools 70+

This test was previously skipped because we didn't have new enough tox.
That's why it was never fixed for setuptools 70+.

This is a fixup for 20b7ac63f3b31f2b52f6ce3e767a445ed7c81ee8

(cherry picked from commit 1532f1893f528a1eba0d49a5de972b6002100f8f)
---
 pyproject-rpm-macros.spec              |  5 ++++-
 pyproject_buildrequires_testcases.yaml | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec
index d8080c1..da44d25 100644
--- a/pyproject-rpm-macros.spec
+++ b/pyproject-rpm-macros.spec
@@ -14,7 +14,7 @@ License:        MIT
 #   Increment Y and reset Z when new macros or features are added
 #   Increment Z when this is a bugfix or a cosmetic change
 # Dropping support for EOL Fedoras is *not* considered a breaking change
-Version:        1.16.1
+Version:        1.16.2
 Release:        1%{?dist}
 
 # Macro files
@@ -196,6 +196,9 @@ export HOSTNAME="rpmbuild"  # to speedup tox in network-less mock, see rhbz#1856
 
 
 %changelog
+* Wed Nov 13 2024 Miro Hrončok <mhroncok@redhat.com> - 1.16.2-1
+- Fix one remaining test for setuptools 70+
+
 * Thu Nov 07 2024 Miro Hrončok <miro@hroncok.cz> - 1.16.1-1
 - Support for setuptools 70+
 - wheel is no longer generated as a dependency of the default build system
diff --git a/pyproject_buildrequires_testcases.yaml b/pyproject_buildrequires_testcases.yaml
index 29f3f1d..a374fa0 100644
--- a/pyproject_buildrequires_testcases.yaml
+++ b/pyproject_buildrequires_testcases.yaml
@@ -1591,12 +1591,20 @@ tox with dependency_groups:
     [tool.tox.env_run_base]
     dependency_groups = ["tests"]
     commands = [["pytest"]]
-  expected: |
-    python3dist(setuptools)
-    python3dist(wheel)
-    python3dist(tox-current-env) >= 0.0.6
-    python3dist(tox) >= 4.22
-    python3dist(tox)
-    python3dist(pytest) >= 5
-    python3dist(pytest-mock)
+  expected:
+    - |  # setuptools 70+
+      python3dist(setuptools)
+      python3dist(tox-current-env) >= 0.0.6
+      python3dist(tox) >= 4.22
+      python3dist(tox)
+      python3dist(pytest) >= 5
+      python3dist(pytest-mock)
+    - |  # setuptools < 70
+      python3dist(setuptools)
+      python3dist(wheel)
+      python3dist(tox-current-env) >= 0.0.6
+      python3dist(tox) >= 4.22
+      python3dist(tox)
+      python3dist(pytest) >= 5
+      python3dist(pytest-mock)
   result: 0