From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 10 Feb 2020 13:48:02 +0000 (+0100)
Subject: travis: Add workaround for a tox/virtualenv/six issue
X-Git-Tag: 5.8.3dr1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d450e926de65e5517293d38ec3ad2a1a17020d05;p=thirdparty%2Fstrongswan.git

travis: Add workaround for a tox/virtualenv/six issue

virtualenv is installed as dependency of tox and 20.0.0 added a
dependency on a newer version of six, which is not automatically
installed/updated.
---

diff --git a/scripts/test.sh b/scripts/test.sh
index 87be180c9c..3531fdb745 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"
+	PYDEPS="tox six>=1.12.0"
 	if test "$1" = "deps"; then
 		build_botan
 		build_wolfssl