From 66a8e51945f1629ead8d33163c2570be588f7921 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Wed, 7 Dec 2022 15:19:40 -0800
Subject: [PATCH] Avoid tox-bindep in test-tox job

The test-tox job exercises the "requires" setting in tox.ini, and
to do so it uses a small package, tox-bindep.  This was originally
added in I521580da978903cd116c872447b1c028c470e63d.

This package is not compatible with tox v4, so to retain this test
we update the test tox.ini file to use another small package,
requestsexceptions, which does not interact with tox and so does
not suffer from this problem.

Change-Id: I6c4737c138bf138afbb4b15d64ac11437c725d4a
---
 test-playbooks/python/tox.ini  | 6 ++----
 test-playbooks/python/tox.yaml | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test-playbooks/python/tox.ini b/test-playbooks/python/tox.ini
index 0aac6654c..aca5ecb07 100644
--- a/test-playbooks/python/tox.ini
+++ b/test-playbooks/python/tox.ini
@@ -3,12 +3,10 @@ minversion = 3.2
 envlist = linters
 skipsdist = true
 # Test that we don't break when the requires feature is used
-requires =
-  tox-bindep
-  tox<4
+requires = requestsexceptions
 
 [testenv]
-whitelist_externals = sh
+allowlist_externals = sh
 
 [testenv:linters]
 commands = sh -c "echo linters >> {posargs}"
diff --git a/test-playbooks/python/tox.yaml b/test-playbooks/python/tox.yaml
index 4836b42f2..955ee1337 100644
--- a/test-playbooks/python/tox.yaml
+++ b/test-playbooks/python/tox.yaml
@@ -34,7 +34,7 @@
             name: tox
           vars:
             zuul_work_dir: "{{ zuul.project.src_dir }}/test-playbooks/python/"
-            tox_extra_args: "{{ default_tempfile.path }}"
+            tox_extra_args: "-- {{ default_tempfile.path }}"
             tox_install_siblings: false
             tox_envlist: ''
 
@@ -62,7 +62,7 @@
           vars:
             zuul_work_dir: "{{ zuul.project.src_dir }}/test-playbooks/python/"
             tox_install_siblings: false
-            tox_extra_args: "{{ ALL_tempfile.path }}"
+            tox_extra_args: "-- {{ ALL_tempfile.path }}"
             tox_envlist: 'ALL'
       always:
         - name: Make sure magic lines are present