From 60d41022eab90ca21b09c214290f8625d7d715f0 Mon Sep 17 00:00:00 2001 From: link2xt Date: Sun, 14 Nov 2021 00:00:00 +0000 Subject: [PATCH] scripts: switch from python 3.6 to python 3.7 PEP 562 (__getattr__ in deltachat.const module) is implemented only since python 3.7 --- scripts/docker-coredeps-arm64/deps/build_python.sh | 10 +++++----- scripts/docker-coredeps/deps/build_python.sh | 10 +++++----- scripts/run_all.sh | 4 +--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/scripts/docker-coredeps-arm64/deps/build_python.sh b/scripts/docker-coredeps-arm64/deps/build_python.sh index a5e980b2a..fc5e5e804 100755 --- a/scripts/docker-coredeps-arm64/deps/build_python.sh +++ b/scripts/docker-coredeps-arm64/deps/build_python.sh @@ -2,13 +2,13 @@ set -x -e -# we use the python3.6 environment as the base environment -/opt/python/cp36-cp36m/bin/pip install tox devpi-client auditwheel +# we use the python3.7 environment as the base environment +/opt/python/cp37-cp37m/bin/pip install tox devpi-client auditwheel pushd /usr/bin -ln -s /opt/_internal/cpython-3.6.*/bin/tox -ln -s /opt/_internal/cpython-3.6.*/bin/devpi -ln -s /opt/_internal/cpython-3.6.*/bin/auditwheel +ln -s /opt/_internal/cpython-3.7.*/bin/tox +ln -s /opt/_internal/cpython-3.7.*/bin/devpi +ln -s /opt/_internal/cpython-3.7.*/bin/auditwheel popd diff --git a/scripts/docker-coredeps/deps/build_python.sh b/scripts/docker-coredeps/deps/build_python.sh index da1230f52..8a36e8374 100755 --- a/scripts/docker-coredeps/deps/build_python.sh +++ b/scripts/docker-coredeps/deps/build_python.sh @@ -2,13 +2,13 @@ set -x -e -# we use the python3.6 environment as the base environment -/opt/python/cp36-cp36m/bin/pip install tox devpi-client auditwheel +# we use the python3.7 environment as the base environment +/opt/python/cp37-cp37m/bin/pip install tox devpi-client auditwheel pushd /usr/bin -ln -s /opt/_internal/cpython-3.6.*/bin/tox -ln -s /opt/_internal/cpython-3.6.*/bin/devpi -ln -s /opt/_internal/cpython-3.6.*/bin/auditwheel +ln -s /opt/_internal/cpython-3.7.*/bin/tox +ln -s /opt/_internal/cpython-3.7.*/bin/devpi +ln -s /opt/_internal/cpython-3.7.*/bin/auditwheel popd diff --git a/scripts/run_all.sh b/scripts/run_all.sh index 17973ad91..4d24f9489 100755 --- a/scripts/run_all.sh +++ b/scripts/run_all.sh @@ -19,11 +19,9 @@ export DCC_RS_TARGET=release # Configure access to a base python and to several python interpreters # needed by tox below. -export PATH=$PATH:/opt/python/cp36-cp36m/bin +export PATH=$PATH:/opt/python/cp37-cp37m/bin export PYTHONDONTWRITEBYTECODE=1 pushd /bin -rm -f python3.6 -ln -s /opt/python/cp36-cp36m/bin/python3.6 rm -f python3.7 ln -s /opt/python/cp37-cp37m/bin/python3.7 rm -f python3.8