From ead067e775b4a6a5f38fb1db1c2f80ecafd1ac23 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 13 Feb 2020 16:34:27 +0100 Subject: [PATCH] Revert "travis: Add workaround for a tox/virtualenv/six issue" This reverts commit d450e926de65e5517293d38ec3ad2a1a17020d05. Was fixed by making tox depend on newer versions of six so the package gets installed/updated automatically now when installing tox. There is also some ongoing work that tries to make virtualenv work with older versions of six. --- scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 936e1da850..c0de4874d3 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -157,7 +157,7 @@ all|coverage|sonarcloud) libmysqlclient-dev libsqlite3-dev clearsilver-dev libfcgi-dev libpcsclite-dev libpam0g-dev binutils-dev libnm-dev libgcrypt20-dev libjson-c-dev iptables-dev python-pip libtspi-dev libsystemd-dev" - PYDEPS="tox six>=1.12.0" + PYDEPS="tox" if test "$1" = "deps"; then build_botan build_wolfssl