From 6220a473f3ad2b5238717de832f508b557c6586c Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Wed, 26 Apr 2023 11:59:44 -0700
Subject: [PATCH] Support tox4

Change-Id: If15c3fee706d295de678f812839a5d0759089ccf
---
 .zuul.yaml | 2 --
 setup.cfg  | 4 +++-
 tox.ini    | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 915e0c0c8d..76442c24a5 100644
--- 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
diff --git a/setup.cfg b/setup.cfg
index 321222e269..5d0a81ed54 100644
--- 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
diff --git a/tox.ini b/tox.ini
index e08e24cd19..3038cd1a91 100644
--- 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