diff --git a/ci_scripts/old/run-python.sh b/ci_scripts/old/run-python.sh index d431507e0..81506fc21 100755 --- a/ci_scripts/old/run-python.sh +++ b/ci_scripts/old/run-python.sh @@ -46,6 +46,7 @@ if [ -n "$TESTS" ]; then tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr" tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr" unset DCC_PY_LIVECONFIG + unset DCC_NEW_TMP_EMAIL tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc tox --workdir "$TOXWORKDIR" -e auditwheels popd diff --git a/ci_scripts/remote_python_packaging.sh b/ci_scripts/remote_python_packaging.sh index 7a2db322a..c6042ace8 100755 --- a/ci_scripts/remote_python_packaging.sh +++ b/ci_scripts/remote_python_packaging.sh @@ -32,11 +32,11 @@ ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE set +x -e cd $BUILDDIR export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG - + export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL set -x # run everything else inside docker - docker run -e DCC_PY_LIVECONFIG \ + docker run -e DCC_NEW_TMP_EMAIL -e DCC_PY_LIVECONFIG \ --rm -it -v \$(pwd):/mnt -w /mnt \ deltachat/coredeps ci_scripts/run_all.sh diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index 49ae24197..98ffac7a5 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -30,6 +30,7 @@ ssh $SSHTARGET <<_HERE export CARGO_TARGET_DIR=\`pwd\`/../target export TARGET=release export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG + export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL #we rely on tox/virtualenv being available in the host #rm -rf virtualenv venv diff --git a/ci_scripts/run_all.sh b/ci_scripts/run_all.sh index 0d32d4645..6565ceedb 100755 --- a/ci_scripts/run_all.sh +++ b/ci_scripts/run_all.sh @@ -37,7 +37,8 @@ mkdir -p $TOXWORKDIR # XXX we may switch on some live-tests on for better ensurances # Note that the independent remote_tests_python step does all kinds of # live-testing already. -unset DCC_PY_LIVECONFIG +unset DCC_PY_LIVECONFIG +unset DCC_NEW_TMP_EMAIL tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels popd diff --git a/python/tox.ini b/python/tox.ini index 5ad7caa7f..965607770 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -14,6 +14,7 @@ passenv = DCC_RS_DEV DCC_RS_TARGET DCC_PY_LIVECONFIG + DCC_NEW_TMP_EMAIL CARGO_TARGET_DIR RUSTC_WRAPPER deps =