Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ci-install-setuptools'

Browse Source 
Fixes for CI after apparent changes to GitHub Actions Ubuntu 16.04
images.
This commit is contained in:
Vadim Zeitlin
2021-07-11 00:06:50 +02:00
parent 49d799fcd3 0f91a4bb1f
commit c0c183ac17
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/tools/httpbin.sh
View File

@@ -35,15 +35,14 @@ httpbin_launch() {
blinker==1.4 brotlipy==0.7.0 cffi==1.14.5 click==7.0 decorator==4.4.2 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' 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 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 if ! python3 -c 'import pip'; then
sudo apt-get -q -o=Dpkg::Use-Pty=0 install python3-pip sudo apt-get -q -o=Dpkg::Use-Pty=0 install python3-pip
fi fi