diff options
| author | Tim Burke <tim.burke@gmail.com> | 2022-12-27 14:10:54 -0800 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-12-29 13:36:06 -0800 |
| commit | 2d7c1dc6dd8a672c1f89a46b2423898d33ff63d2 (patch) | |
| tree | 07237c5e26872b4b3e941eb4dda070f94d43f3f8 /tools | |
| parent | 0c18b2d32910d507203b72c78fbcef8089ab9e5c (diff) | |
| download | swift-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 'tools')
| -rw-r--r-- | tools/playbooks/common/install_dependencies.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml index 40eecd037..808487fe7 100644 --- a/tools/playbooks/common/install_dependencies.yaml +++ b/tools/playbooks/common/install_dependencies.yaml @@ -39,8 +39,10 @@ # trying to install a too-new mock or attrs?? - 'mock<4' - 'attrs<22.1.0' + # crudini pulls in iniparse which can conflict with distro-installed + # packages on centos7 + - 'crudini<0.9.4' # Order matters; install constrained versions *first*, then unconstrained - - crudini - eventlet - pyeclib - pytest |