Support tox4

Change-Id: If15c3fee706d295de678f812839a5d0759089ccf
2023-04-26 11:59:44 -07:00 · 2023-04-26 11:59:44 -07:00 · 6220a473f3
commit 6220a473f3
parent fcbe00a5cd
3 changed files with 3 additions and 5 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -646,8 +646,6 @@
       - swift-tox-func-py38-arm64

 - project:
-    vars:
-      ensure_tox_version: '<4'
    templates:
      - publish-openstack-docs-pti
      - periodic-stable-jobs
--- a/setup.cfg
+++ b/setup.cfg
@ -35,9 +35,11 @@ skip_authors = True
 skip_changelog = True
 skip_reno = True

-[files]
+[options]
 packages =
    swift
+
+[files]
 scripts =
    bin/swift-account-audit
    bin/swift-account-auditor
--- a/tox.ini
+++ b/tox.ini
@ -4,8 +4,6 @@ minversion = 3.18.0
 requires =
  # required to support py27/py36 envs
  virtualenv<20.22
-  # project-wide requirement; see .zuul.yaml
-  tox<4

 [pytest]
 addopts = --verbose -p no:requests_mock