From 398c40577e475cf980f76a1b5fcd2b6d2451c260 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Apr 11 2024 15:39:25 +0000
Subject: [PATCH 1/3] Unskip working tests


---

diff --git a/python-tox.spec b/python-tox.spec
index 1d8623f..7c6d7e5 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -144,10 +144,6 @@ k="${k-}${k+ and }not test_build_wheel_external"
 k="${k-}${k+ and }not keyboard_interrupt"
 k="${k-}${k+ and }not test_call_as_module"
 k="${k-}${k+ and }not test_call_as_exe"
-# test_local_execute_* have "\r\n" in outputs for some
-# unknown reason, reported: https://github.com/tox-dev/tox/issues/2841
-k="${k-}${k+ and }not test_local_execute_basic_pass_show_on_standard_newline_flush"
-k="${k-}${k+ and }not test_local_execute_write_a_lot"
 k="${k-}${k+ and }not test_run_installpkg_targz"
 %endif
 

From 138efcfbbc2609a6f961761f6dd0faf104828210 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Apr 11 2024 15:39:25 +0000
Subject: [PATCH 2/3] Fix CI confusion wrt tox %{release}


We were seeing:

    No match for argument: tox = 4.12.1-1.fc41

Apparently, standard-test-source does not handle the dist-git history.
Hence, when the SRPM is built in mocktest.sh, %autorelease is set to 1.
However, the available tox from the CI scratchbuild might have a greater Release.

We relax the BuildRequirement.
We assume mock will install the right build anyway.
The CI scratchbuild will either have a different (usually greater) Version
when the PR upgrades or downgrades tox
or a greater Release otherwise, thanks to %autorelease.

---

diff --git a/python-tox.spec b/python-tox.spec
index 7c6d7e5..dcbf474 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -52,7 +52,8 @@ BuildRequires:  python3-pytest-xdist
 BuildRequires:  python3.10
 %if %{with ci_tests}
 # The CI tests only work if the tested tox is installed :(
-BuildRequires:  tox = %{version}-%{release}
+# This should technically be the same V-R, but the CI does not handle %%autorelease well
+BuildRequires:  tox = %{version}
 %endif
 %endif
 

From 58254264ac969cccdf14faee1ed88511ec8ba3a4 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Apr 11 2024 15:39:25 +0000
Subject: [PATCH 3/3] Remove no longer needed BuildRequires for python3.10


---

diff --git a/python-tox.spec b/python-tox.spec
index dcbf474..521b201 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -47,9 +47,6 @@ BuildRequires:  /usr/bin/python
 BuildRequires:  libffi-devel
 # xdist is not used upstream, but we use it to speed up the %%check
 BuildRequires:  python3-pytest-xdist
-# for test_allowed_implicit_cli_envs[py310]
-# TODO remove this once https://github.com/tox-dev/tox/pull/3108 is released
-BuildRequires:  python3.10
 %if %{with ci_tests}
 # The CI tests only work if the tested tox is installed :(
 # This should technically be the same V-R, but the CI does not handle %%autorelease well