From: Tobias Brunner Date: Wed, 5 May 2021 16:46:49 +0000 (+0200) Subject: github: Fix python build and checks on older Ubuntu releases X-Git-Tag: 5.9.3dr2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7308732111754dbc37751f1234eb5f62ea47c46;p=thirdparty%2Fstrongswan.git github: Fix python build and checks on older Ubuntu releases On 18.04, setuptools was apparently pulled in by python-pip but is not by python3-pip and on Ubuntu 16.04 there is an issue with tox when installed via pip3 (syntax error in one of the dependencies) and with pip that dependency is not even available. --- diff --git a/scripts/test.sh b/scripts/test.sh index 2028db33db..bd155b043a 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -178,9 +178,12 @@ all|coverage|sonarcloud) if [ "$ID" = "ubuntu" -a "$VERSION_ID" = "20.04" ]; then DEPS="$DEPS libiptc-dev" else - DEPS="$DEPS iptables-dev" + DEPS="$DEPS iptables-dev python3-setuptools" + fi + # tox has dependencies that can't be resolved on 16.04 (even with pip) + if [ "$ID" != "ubuntu" -o "$VERSION_ID" != "16.04" ]; then + PYDEPS="tox" fi - PYDEPS="tox" if test "$1" = "build-deps"; then if [ "$ID" != "ubuntu" -o "$VERSION_ID" != "16.04" ]; then build_botan