From d6a4e0079564413e7d1e9231ca7a029ea97c105a Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Wed, 18 Mar 2026 13:31:54 +0000 Subject: [PATCH] SET-2017 Migrate to tox v4 --- gh-test-requirements.txt | 2 +- tox.ini | 176 +++++++++++++++++++-------------------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/gh-test-requirements.txt b/gh-test-requirements.txt index eb28166c..a18daf8d 100644 --- a/gh-test-requirements.txt +++ b/gh-test-requirements.txt @@ -1 +1 @@ -tox<4.0.0 +tox-gh-actions diff --git a/tox.ini b/tox.ini index 3eacbd91..564296bc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ # This is a templated file and must be kept up-to-date with the original # from upstream at https://github.com/canonical/se-tooling-ci-common. [tox] -skipsdist = True envlist = bashate,pep8,pylint -minversion = 3.18.0 +minversion = 4.50.0 [flake8] # H106: Don't put vim configuration in source files @@ -17,99 +16,100 @@ exclude = import-order-style = pep8 [testenv] +skip_install = true basepython = {env:TOX_PYTHON:python3} pyfiles = - {toxinidir}/openstack/tools/func_test_tools - {toxinidir}/tools/parse-bundle.py + {toxinidir}/openstack/tools/func_test_tools \ + {toxinidir}/tools/parse-bundle.py \ {toxinidir}/tools/juju-bundle-applications.py bashfiles = # universal find command: # find ./ -regextype egrep -regex ".*/configure|.*/.*\.sh|.*/juju-lnav|.*/generate_bundle_base|.*/novarc" | egrep -v ".tox|.git|.sphinx" | sed -rn 's,^.,{toxinidir},p' - {toxinidir}/common/generate_bundle_base - {toxinidir}/common/generate-bundle.sh - {toxinidir}/common/ch_channel_map/test-channel-map.sh - {toxinidir}/common/ch_channel_map/test-all.sh - {toxinidir}/ceph/novarc - {toxinidir}/ceph/tools/install_local_ca.sh - {toxinidir}/ceph/tools/vault-unseal-and-authorise.sh - {toxinidir}/ceph/generate-bundle.sh - {toxinidir}/ceph/configure - {toxinidir}/microk8s/novarc - {toxinidir}/microk8s/generate-bundle.sh - {toxinidir}/microk8s/configure - {toxinidir}/tools/stack-manager/mark-model-vms-unmanaged.sh - {toxinidir}/tools/stack-manager/show-unmanaged.sh - {toxinidir}/tools/stack-manager/mark-model-vms-managed.sh - {toxinidir}/tools/stack-manager/mark-vms-managed.sh - {toxinidir}/tools/stack-manager/mark-vms-unmanaged.sh - {toxinidir}/tools/stack-manager/show-managed.sh - {toxinidir}/tools/stack-manager/show-all.sh - {toxinidir}/tools/stack-manager/common.sh - {toxinidir}/tools/vault-unseal-and-authorise.sh - {toxinidir}/tools/model-poweroff.sh - {toxinidir}/tools/cleanup-cinder-attachments.sh - {toxinidir}/tools/bootstrap-k8s-cloud.sh - {toxinidir}/tools/model-poweron.sh - {toxinidir}/tools/mongo-access.sh - {toxinidir}/tools/juju-lnav - {toxinidir}/openstack/novarc - {toxinidir}/openstack/tools/sec_groups.sh - {toxinidir}/openstack/tools/charmed_openstack_functest_runner.sh - {toxinidir}/openstack/tools/create_nova_az_aggregates.sh - {toxinidir}/openstack/tools/allocate_vips.sh - {toxinidir}/openstack/tools/enable_samltestid.sh - {toxinidir}/openstack/tools/install_local_ca.sh - {toxinidir}/openstack/tools/setup_tempest.sh - {toxinidir}/openstack/tools/construct_novarc.sh - {toxinidir}/openstack/tools/vault-unseal-and-authorise.sh - {toxinidir}/openstack/tools/upload_octavia_amphora_image.sh - {toxinidir}/openstack/tools/create_ipv4_octavia.sh - {toxinidir}/openstack/tools/func_test_tools/manual_functests_runner.sh - {toxinidir}/openstack/tools/func_test_tools/common.sh - {toxinidir}/openstack/tools/configure_octavia.sh - {toxinidir}/openstack/tools/float_all.sh - {toxinidir}/openstack/tools/instance_launch.sh - {toxinidir}/openstack/tools/upload_image.sh - {toxinidir}/openstack/tools/openstack_regression_tests_runner.sh - {toxinidir}/openstack/tools/juju-lnav - {toxinidir}/openstack/tools/create-microceph-vm.sh - {toxinidir}/openstack/tools/create_sg_log.sh - {toxinidir}/openstack/tools/create_octavia_lb.sh - {toxinidir}/openstack/tools/create_project.sh - {toxinidir}/openstack/tools/delete_project.sh - {toxinidir}/openstack/generate-bundle.sh - {toxinidir}/openstack/bin/add-data-ports.sh - {toxinidir}/openstack/configure - {toxinidir}/jaas/generate-bundle.sh - {toxinidir}/jaas/configure - {toxinidir}/swift/novarc - {toxinidir}/swift/tools/install_local_ca.sh - {toxinidir}/swift/generate-bundle.sh - {toxinidir}/swift/configure - {toxinidir}/lint/check_var_defaults.sh - {toxinidir}/cos/generate-bundle.sh - {toxinidir}/cos/configure - {toxinidir}/osm/generate-bundle.sh - {toxinidir}/osm/configure - {toxinidir}/kafka/tools/install_local_ca.sh - {toxinidir}/kafka/tools/vault-unseal-and-authorise.sh - {toxinidir}/kafka/tools/create_volumes.sh - {toxinidir}/kafka/tools/init_storage.sh - {toxinidir}/kafka/generate-bundle.sh - {toxinidir}/kafka/configure - {toxinidir}/landscape/generate-bundle.sh - {toxinidir}/landscape/configure - {toxinidir}/ssl/create_ca_cert_jaas.sh - {toxinidir}/ssl/create_ca_cert.sh - {toxinidir}/identity-platform/generate-bundle.sh - {toxinidir}/identity-platform/configure - {toxinidir}/kubernetes/novarc - {toxinidir}/kubernetes/tools/install_local_ca.sh - {toxinidir}/kubernetes/tools/vault-unseal-and-authorise.sh - {toxinidir}/kubernetes/tools/configure_docker_registry.sh - {toxinidir}/kubernetes/tools/rook-setup.sh - {toxinidir}/kubernetes/generate-bundle.sh + {toxinidir}/common/generate_bundle_base \ + {toxinidir}/common/generate-bundle.sh \ + {toxinidir}/common/ch_channel_map/test-channel-map.sh \ + {toxinidir}/common/ch_channel_map/test-all.sh \ + {toxinidir}/ceph/novarc \ + {toxinidir}/ceph/tools/install_local_ca.sh \ + {toxinidir}/ceph/tools/vault-unseal-and-authorise.sh \ + {toxinidir}/ceph/generate-bundle.sh \ + {toxinidir}/ceph/configure \ + {toxinidir}/microk8s/novarc \ + {toxinidir}/microk8s/generate-bundle.sh \ + {toxinidir}/microk8s/configure \ + {toxinidir}/tools/stack-manager/mark-model-vms-unmanaged.sh \ + {toxinidir}/tools/stack-manager/show-unmanaged.sh \ + {toxinidir}/tools/stack-manager/mark-model-vms-managed.sh \ + {toxinidir}/tools/stack-manager/mark-vms-managed.sh \ + {toxinidir}/tools/stack-manager/mark-vms-unmanaged.sh \ + {toxinidir}/tools/stack-manager/show-managed.sh \ + {toxinidir}/tools/stack-manager/show-all.sh \ + {toxinidir}/tools/stack-manager/common.sh \ + {toxinidir}/tools/vault-unseal-and-authorise.sh \ + {toxinidir}/tools/model-poweroff.sh \ + {toxinidir}/tools/cleanup-cinder-attachments.sh \ + {toxinidir}/tools/bootstrap-k8s-cloud.sh \ + {toxinidir}/tools/model-poweron.sh \ + {toxinidir}/tools/mongo-access.sh \ + {toxinidir}/tools/juju-lnav \ + {toxinidir}/openstack/novarc \ + {toxinidir}/openstack/tools/sec_groups.sh \ + {toxinidir}/openstack/tools/charmed_openstack_functest_runner.sh \ + {toxinidir}/openstack/tools/create_nova_az_aggregates.sh \ + {toxinidir}/openstack/tools/allocate_vips.sh \ + {toxinidir}/openstack/tools/enable_samltestid.sh \ + {toxinidir}/openstack/tools/install_local_ca.sh \ + {toxinidir}/openstack/tools/setup_tempest.sh \ + {toxinidir}/openstack/tools/construct_novarc.sh \ + {toxinidir}/openstack/tools/vault-unseal-and-authorise.sh \ + {toxinidir}/openstack/tools/upload_octavia_amphora_image.sh \ + {toxinidir}/openstack/tools/create_ipv4_octavia.sh \ + {toxinidir}/openstack/tools/func_test_tools/manual_functests_runner.sh \ + {toxinidir}/openstack/tools/func_test_tools/common.sh \ + {toxinidir}/openstack/tools/configure_octavia.sh \ + {toxinidir}/openstack/tools/float_all.sh \ + {toxinidir}/openstack/tools/instance_launch.sh \ + {toxinidir}/openstack/tools/upload_image.sh \ + {toxinidir}/openstack/tools/openstack_regression_tests_runner.sh \ + {toxinidir}/openstack/tools/juju-lnav \ + {toxinidir}/openstack/tools/create-microceph-vm.sh \ + {toxinidir}/openstack/tools/create_sg_log.sh \ + {toxinidir}/openstack/tools/create_octavia_lb.sh \ + {toxinidir}/openstack/tools/create_project.sh \ + {toxinidir}/openstack/tools/delete_project.sh \ + {toxinidir}/openstack/generate-bundle.sh \ + {toxinidir}/openstack/bin/add-data-ports.sh \ + {toxinidir}/openstack/configure \ + {toxinidir}/jaas/generate-bundle.sh \ + {toxinidir}/jaas/configure \ + {toxinidir}/swift/novarc \ + {toxinidir}/swift/tools/install_local_ca.sh \ + {toxinidir}/swift/generate-bundle.sh \ + {toxinidir}/swift/configure \ + {toxinidir}/lint/check_var_defaults.sh \ + {toxinidir}/cos/generate-bundle.sh \ + {toxinidir}/cos/configure \ + {toxinidir}/osm/generate-bundle.sh \ + {toxinidir}/osm/configure \ + {toxinidir}/kafka/tools/install_local_ca.sh \ + {toxinidir}/kafka/tools/vault-unseal-and-authorise.sh \ + {toxinidir}/kafka/tools/create_volumes.sh \ + {toxinidir}/kafka/tools/init_storage.sh \ + {toxinidir}/kafka/generate-bundle.sh \ + {toxinidir}/kafka/configure \ + {toxinidir}/landscape/generate-bundle.sh \ + {toxinidir}/landscape/configure \ + {toxinidir}/ssl/create_ca_cert_jaas.sh \ + {toxinidir}/ssl/create_ca_cert.sh \ + {toxinidir}/identity-platform/generate-bundle.sh \ + {toxinidir}/identity-platform/configure \ + {toxinidir}/kubernetes/novarc \ + {toxinidir}/kubernetes/tools/install_local_ca.sh \ + {toxinidir}/kubernetes/tools/vault-unseal-and-authorise.sh \ + {toxinidir}/kubernetes/tools/configure_docker_registry.sh \ + {toxinidir}/kubernetes/tools/rook-setup.sh \ + {toxinidir}/kubernetes/generate-bundle.sh \ {toxinidir}/kubernetes/configure setenv =