From 623465ef8b400a27eb7cd9a61db325f6f58a7e2a Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Mon, 28 Nov 2022 11:26:37 +0530
Subject: [PATCH] Fix openstack-tox* failures

Looks like tox-extra plugin breaks openstack-tox*
jobs. Not sure if this is regression. I don't see
it being used in any other openstack projects.
Let's drop it.

Also cleans up things in setup.py.

Conflicts:
	tox.ini

Backport note:
This backport effectively backports the change[1] to fix encoding
errors.

[1] https://review.opendev.org/805119

Closes-Bug: #1998074
Change-Id: I154bfc36cc56f6b5425ec6bf805a290973203ba1
(cherry picked from commit 889dffa6a8a65d50d418c3724abb1912d5d4e882)
(cherry picked from commit e675ecb95561b5061b5c2b5737348c0bd818feac)
---
 setup.py | 8 --------
 tox.ini  | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index be253e10a2..dd26ed49b7 100644
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     py_modules=[],
diff --git a/tox.ini b/tox.ini
index 7468c26476..5fb49983c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,6 @@
 minversion = 2.0
 skipsdist = True
 envlist = pep8,py,tht
-requires =
-    # extra plugin returns error if git reports untracked or dirty files
-    tox-extra>=0.0.0
 
 [testenv]
 basepython = python3
@@ -16,6 +13,9 @@ deps =
 commands =
   stestr run {posargs}
   stestr slowest
+setenv =
+  VIRTUAL_ENV={envdir}
+  LC_ALL=en_US.UTF-8
 
 [testenv:venv]
 commands = {posargs}