Merge "Avoid tox-bindep in test-tox job"

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}"

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