summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2022-12-27 14:10:54 -0800
committerTim Burke <tim.burke@gmail.com>2022-12-29 13:36:06 -0800
commit2d7c1dc6dd8a672c1f89a46b2423898d33ff63d2 (patch)
tree07237c5e26872b4b3e941eb4dda070f94d43f3f8 /tox.ini
parent0c18b2d32910d507203b72c78fbcef8089ab9e5c (diff)
downloadswift-2d7c1dc6dd8a672c1f89a46b2423898d33ff63d2.tar.gz
CI: Fix our usage of tox
For tox 3.x and earlier, passenv was a space-separated list; as of tox 4.0.0, it's comma-separated. For a while, our spaces would be silently included in the now-one-and-only passenv value parsed (which wasn't great, but mostly just caused confusion) -- as of tox 4.0.6, however, it became a hard error, and all tests would fail like pass_env values cannot contain whitespace, use comma to have multiple values in a single line, invalid values found 'SWIFT_* *_proxy' Unfortunately, we don't really know what versions of tox all our various stakeholders might want/need to use (though we previously set a minversion of 2.3.2). We might be able to spread values over multiple lines to make it compatible with both tox 3 *and* tox 4, but I'm fairly certain *_proxy was only included for some variables that are recent versions of tox include by default anyway, so just increase our minversion (which was too low, anyway -- allowlist_externals which we already configure was added in 3.18.0) and get rid of *_proxy. FWIW, python-swiftclient was already specifying 3.18.0 as a minversion, so I expect the new minversion to not be a problem. Also, add ./.functests to a bunch of allowlist_externals, as newer tox is more strict about that sort of thing. Drop skipsdist in a bunch of places so we can import swift from func tests and docs. (Still not sure why I don't see us hitting a similar problem for unit tests...) Change-Id: I4be1e86e3291ad1619c695fb93d7cadf053b556d
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini28
1 files changed, 24 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index e1a6074af..6ce934b76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
[tox]
envlist = py37,py27,pep8
-minversion = 2.3.2
-skipsdist = True
+minversion = 3.18.0
[pytest]
addopts = --verbose --cov=swift --cov-branch --cov-report=html:cover --cov-report term
@@ -21,14 +20,18 @@ commands =
allowlist_externals =
bash
find
-passenv = SWIFT_* *_proxy
+passenv = SWIFT_*
[testenv:s3api]
usedevelop = False
deps = {[testenv:py36]deps}
commands =
pytest {posargs:test/s3api}
-passenv = SWIFT_* *_proxy
+passenv = SWIFT_*
+# For some reason we hit some EPERM issue when building the package for these tests?
+# (CentOS 8, CPython 3.6, tox 3.28.0)
+skipsdist = True
+skip_install = True
[testenv:py27]
deps =
@@ -49,6 +52,8 @@ deps = {[testenv:py36]deps}
setenv = VIRTUAL_ENV={envdir}
[testenv:pep8]
+allowlist_externals =
+ ./.manpages
commands =
flake8 {posargs:swift test doc setup.py}
flake8 --filename=bin/swift* bin
@@ -59,11 +64,15 @@ commands =
[testenv:func-py3]
basepython = python3
deps = {[testenv:py36]deps}
+allowlist_externals =
+ ./.functests
commands = ./.functests {posargs}
[testenv:func-ec-py3]
basepython = python3
deps = {[testenv:py36]deps}
+allowlist_externals =
+ ./.functests
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
@@ -71,6 +80,8 @@ setenv = SWIFT_TEST_IN_PROCESS=1
[testenv:func-encryption-py3]
basepython = python3
deps = {[testenv:py36]deps}
+allowlist_externals =
+ ./.functests
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
@@ -78,11 +89,15 @@ setenv = SWIFT_TEST_IN_PROCESS=1
[testenv:func]
basepython = python2.7
deps = {[testenv:py27]deps}
+allowlist_externals =
+ ./.functests
commands = ./.functests {posargs}
[testenv:func-encryption]
basepython = python2.7
deps = {[testenv:py27]deps}
+allowlist_externals =
+ ./.functests
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
@@ -90,6 +105,8 @@ setenv = SWIFT_TEST_IN_PROCESS=1
[testenv:func-ec]
basepython = python2.7
deps = {[testenv:py27]deps}
+allowlist_externals =
+ ./.functests
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
@@ -166,6 +183,9 @@ deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
+# Drop the --upgrade flag so we don't accidentally drag anything forward when
+# we install swift
+install_command = pip install {opts} {packages}
[testenv:pdf-docs]
basepython = python3