From e5638ba06140a9d5bbecb7a47a498d8a6562fe1b Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 12 Nov 2024 12:58:23 -0800 Subject: [PATCH] Update bindep.txt to python3 This is used for docs and linting jobs. Also update the tox.ini file to correct the egg name for the zuul dep and other tox changes. Upgrade ansible-lint to a version that works on noble. Change-Id: Ie329be30a3ab29774be67ef9f7f07bfb1c4f0abb --- bindep.txt | 4 ++-- test-requirements.txt | 6 ++---- tox.ini | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bindep.txt b/bindep.txt index 1d637de..e05f83f 100644 --- a/bindep.txt +++ b/bindep.txt @@ -8,7 +8,7 @@ libssl-dev [platform:dpkg] openssl-devel [platform:rpm] libffi-dev [platform:dpkg] libffi-devel [platform:rpm] -python-dev [platform:dpkg] -python-devel [platform:rpm] +python3-dev [test platform:dpkg] +python3-devel [test platform:rpm] libre2-dev [platform:dpkg] re2-devel [platform:rpm] diff --git a/test-requirements.txt b/test-requirements.txt index 1c56f7c..1a9f268 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,10 +3,8 @@ # process, which may cause wedges in the gate later. flake8 -# We need to pin Ansible to <2.6 until Zuul supports it, otherwise ansible-lint -# picks the latest version which is not known to work yet. -ansible>=2.5.1,<2.6 -ansible-lint<4 +ansible>=2.12.0 # required by ansible-lint +ansible-lint>6.8.0,<6.13 flake8 bashate>=0.2 zuul-sphinx>=0.1.1 diff --git a/tox.ini b/tox.ini index ed302f3..04b48a3 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = [testenv:linters] basepython = python3 -whitelist_externals = bash +allowlist_externals = bash setenv = ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/base/library passenv = @@ -37,7 +37,7 @@ passenv = # python3. deps = # Zuul is required to supply the zuul ansible modules for ansible-lint - -egit+https://opendev.org/zuul/zuul#egg=zuul + -egit+https://opendev.org/zuul/zuul\#egg=zuul -r{toxinidir}/test-requirements.txt commands = flake8 {posargs}