diff options
| author | Simon McVittie <smcv@collabora.com> | 2020-01-14 09:57:14 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2020-01-14 09:57:14 +0000 |
| commit | 4667a29ef8142077a90272b9d204ba89c807ab03 (patch) | |
| tree | 40f9848398f9f8dc53af7b1aefeaffdaf952cb3f /tools | |
| parent | b52b8183d682bd03588f3b2e73a434db9d3ceabe (diff) | |
CI: Don't install tap.py for Python 2
The latest version only supports Python 3.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-install.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 319b896..dd554c6 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -153,8 +153,10 @@ case "$ci_distro" in ;; (*) - $sudo apt-get -qq -y install ${dbus_ci_system_python_module_prefix}tap - have_system_tappy=yes + if [ "${dbus_ci_system_python_module_prefix}" = python3- ]; then + $sudo apt-get -qq -y install python3-tap + have_system_tappy=yes + fi ;; esac @@ -213,6 +215,9 @@ fi if [ -n "$have_system_tappy" ]; then : +elif "${PYTHON:-${dbus_ci_system_python-false}}" -c 'import sys; exit(sys.version_info[0] > 2)'; then + # Don't install tap.py for Python 2 + : elif [ -n "${dbus_ci_system_python-}" ]; then "$dbus_ci_system_python" -m pip install --user \ tap.py \ |