summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2022-12-27 13:58:26 -0800
committerTim Burke <tim.burke@gmail.com>2023-01-05 16:58:36 -0800
commit3264fd6cfda8e2c144ba9afd2cf5bc7d1c28ddef (patch)
treec5904e5ee599baa77c2efcca2f8508dc1223ba70
parent7f4855dd1bed11528216c43c85e576736cc46958 (diff)
downloadpython-swiftclient-3264fd6cfda8e2c144ba9afd2cf5bc7d1c28ddef.tar.gz
Drop *_proxy from passenv
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 currently set a minversion of 3.18.0), and (to my knowledge) there's no way to specify multiple values for passenv in a way that would be compatible with both old and new tox. Fortunately, as of 3.14.4, tox include HTTP_PROXY, HTTPS_PROXY, and NO_PROXY in passenv by default. I'm fairly certain those were the only reason we had *_proxy to begin with, so just drop it. Change-Id: I8ddfbc6376434c39e231846135a99bd0bdca9497
-rw-r--r--.zuul.yaml3
-rw-r--r--tox.ini2
2 files changed, 4 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index d38f37f..024b969 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,6 +10,9 @@
# for installation.
required-projects:
- opendev.org/openstack/python-swiftclient
+ vars:
+ # New tox keeps breaking things as of 2023-01
+ ensure_tox_version: '<4'
- job:
name: swiftclient-functional
diff --git a/tox.ini b/tox.ini
index e1e679d..3a6cd8a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
-print0) | xargs -0 rm -rf'
stestr run {posargs}
allowlist_externals = sh
-passenv = SWIFT_* *_proxy
+passenv = SWIFT_*
[testenv:pep8]
commands =