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 commit889dffa6a8
) (cherry picked from commite675ecb955
)
This commit is contained in:
parent
fc038b6847
commit
623465ef8b
8
setup.py
8
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=[],
|
||||
|
|
6
tox.ini
6
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}
|
||||
|
|
Loading…
Reference in New Issue