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
This commit is contained in:
James E. Blair 2022-12-07 15:19:40 -08:00 committed by Clark Boylan
parent 56762e79de
commit 66a8e51945
2 changed files with 4 additions and 6 deletions

View File

@ -3,12 +3,10 @@ minversion = 3.2
envlist = linters envlist = linters
skipsdist = true skipsdist = true
# Test that we don't break when the requires feature is used # Test that we don't break when the requires feature is used
requires = requires = requestsexceptions
tox-bindep
tox<4
[testenv] [testenv]
whitelist_externals = sh allowlist_externals = sh
[testenv:linters] [testenv:linters]
commands = sh -c "echo linters >> {posargs}" commands = sh -c "echo linters >> {posargs}"

View File

@ -34,7 +34,7 @@
name: tox name: tox
vars: vars:
zuul_work_dir: "{{ zuul.project.src_dir }}/test-playbooks/python/" 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_install_siblings: false
tox_envlist: '' tox_envlist: ''
@ -62,7 +62,7 @@
vars: vars:
zuul_work_dir: "{{ zuul.project.src_dir }}/test-playbooks/python/" zuul_work_dir: "{{ zuul.project.src_dir }}/test-playbooks/python/"
tox_install_siblings: false tox_install_siblings: false
tox_extra_args: "{{ ALL_tempfile.path }}" tox_extra_args: "-- {{ ALL_tempfile.path }}"
tox_envlist: 'ALL' tox_envlist: 'ALL'
always: always:
- name: Make sure magic lines are present - name: Make sure magic lines are present