From 525fb911d6b23e4f76eaaaed1c6ad21351732cd8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 10 Jul 2021 23:42:58 +0200 Subject: [PATCH 1/2] Remove special case for macOS in httpbin installation script This is not necessary any longer since the changes of 1b76ff4887 (Disable wxWebRequest tests on CI platforms without Python 3, 2021-05-16) as we require Python 3 for httpbin anyhow. --- build/tools/httpbin.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/tools/httpbin.sh b/build/tools/httpbin.sh index 7b9f4df273..2c048d1302 100644 --- a/build/tools/httpbin.sh +++ b/build/tools/httpbin.sh @@ -35,12 +35,6 @@ httpbin_launch() { blinker==1.4 brotlipy==0.7.0 cffi==1.14.5 click==7.0 decorator==4.4.2 itsdangerous==1.1.0 pycparser==2.20 raven==6.10.0 werkzeug==0.16.1' ;; - - macOS) - # We use Python 2 under macOS 10.11 which doesn't have Python 3, - # and decorator >= 5 is incompatible with it too. - pip_explicit_deps='decorator==4.4.2' - ;; esac # Ensure that we have at least some version of pip. From 0f91a4bb1fe2238a3a033eee4913f2f6d86b8a4f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 10 Jul 2021 23:45:27 +0200 Subject: [PATCH 2/2] Get setuptools in httpbin installation script too if necessary This module is not always available, e.g. it's missing in GitHub Actions Ubuntu 16.04 image currently. --- build/tools/httpbin.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/tools/httpbin.sh b/build/tools/httpbin.sh index 2c048d1302..a2d72d6a1b 100644 --- a/build/tools/httpbin.sh +++ b/build/tools/httpbin.sh @@ -37,7 +37,12 @@ httpbin_launch() { ;; esac - # Ensure that we have at least some version of pip. + # Ensure that we have at least some version of pip and setuptools required + # for installing cffi. + if ! python3 -c 'import setuptools'; then + sudo apt-get -q -o=Dpkg::Use-Pty=0 install python3-setuptools + fi + if ! python3 -c 'import pip'; then sudo apt-get -q -o=Dpkg::Use-Pty=0 install python3-pip fi