summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2022-12-26 08:48:27 +0900
committerAkihiro Motoki <amotoki@gmail.com>2022-12-26 08:48:27 +0900
commitaec6340398a5d6e65cda926247c2e08dff29ee4d (patch)
tree3fd82e4f4140988b75599f72f9323c5b5619b4f3
parent0add65eddcd6e70d4fbe76951d76c66ecc1a34b3 (diff)
downloadhorizon-aec6340398a5d6e65cda926247c2e08dff29ee4d.tar.gz
Adjust tox.ini for tox4
OpenStack CI now uses tox4 by default. - Drop "skipsdist = True". If skipsdist is specified, horizon is not installed into tox env. - Env vars specified in passenv should be one per line (or separated by comma) in tox4. Change-Id: I60d2db52e9aac580859de3ed17fde14f9fd262a2
-rw-r--r--tox.ini10
1 files changed, 8 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 3861801a9..fc44eec06 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
[tox]
minversion = 3.18.0
envlist = pep8,py39,releasenotes,npm,py3-dj32
-skipsdist = True
# Automatic envs (pyXX) will only use the python version appropriate to that
# env and ignore basepython inherited from [testenv] if we set
# ignore_basepython_conflict.
@@ -121,7 +120,14 @@ commands =
# Provide an environment for system packagers that dont want anything from pip
# Any extra deps needed for this env can be passed by setting TOX_EXTRA_DEPS
sitepackages = True
-passenv = TOX_EXTRA_DEPS http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv =
+ TOX_EXTRA_DEPS
+ http_proxy
+ HTTP_PROXY
+ https_proxy
+ HTTPS_PROXY
+ no_proxy
+ NO_PROXY
# Sets deps to an empty list so nothing is installed from pip
deps =
commands =