From 3e85c99b74f802a0257182224de6a4ff3cc13bc9 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 10 Jan 2023 13:56:33 -0600
Subject: [PATCH] Fix tox4 error

tox.ini started failing with Tox4 which had some
incompatible changes. One of them is due to the
skipsdist = True.

Fixing tox.ini for tox4 changes.

Additional changes:
* zuul: Declare queue at top level
* fix onflicting with base python error

Change-Id: I9f988e485c1c19eca41175e29fc09c1e28d38b06
(cherry picked from commit deaf2f4f810afda8bb7fd8e6cd99be9a8b1ab264)
(cherry picked from commit 2719d659d97e57929752a4cc9757d79894afd06f)
---
 .zuul.yaml | 4 ++--
 tox.ini    | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a97650f0..9a0aa90c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 - project:
+    queue: kuryr
     templates:
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
@@ -6,5 +7,4 @@
       - release-notes-jobs-python3
       - publish-openstack-docs-pti
       - check-requirements
-    gate:
-      queue: kuryr
+    gate: {}
diff --git a/tox.ini b/tox.ini
index f95610dc..449574ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,8 @@
 [tox]
 minversion = 2.3.1
 envlist = py37,pep8
-skipsdist = True
 
 [testenv]
-basepython = python3
 # Note the hash seed is set to 0 until neutron can be tested with a
 # random hash seed successfully.
 setenv = VIRTUAL_ENV={envdir}