Revert "travis: Add workaround for a tox/virtualenv/six issue"
authorTobias Brunner <tobias@strongswan.org>
Thu, 13 Feb 2020 15:34:27 +0000 (16:34 +0100)
committerTobias Brunner <tobias@strongswan.org>
Thu, 13 Feb 2020 15:34:27 +0000 (16:34 +0100)
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

index 936e1da..c0de487 100755 (executable)
@@ -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