diff --git a/ci_scripts/old/run-python.sh b/ci_scripts/old/run-python.sh index 81506fc21..5573975b1 100755 --- a/ci_scripts/old/run-python.sh +++ b/ci_scripts/old/run-python.sh @@ -45,7 +45,6 @@ if [ -n "$TESTS" ]; then # messages and rust's imap code likely has concurrency problems) 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 diff --git a/ci_scripts/remote_python_packaging.sh b/ci_scripts/remote_python_packaging.sh index ba3d6e355..aeebc2ac1 100755 --- a/ci_scripts/remote_python_packaging.sh +++ b/ci_scripts/remote_python_packaging.sh @@ -30,12 +30,11 @@ ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE set +x -e shopt -s huponexit 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_NEW_TMP_EMAIL -e DCC_PY_LIVECONFIG \ + docker run -e DCC_NEW_TMP_EMAIL \ --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 f4e2b56e8..ab29497b4 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -29,7 +29,6 @@ ssh $SSHTARGET <<_HERE export RUSTC_WRAPPER=\`which sccache\` cd $BUILDDIR 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 diff --git a/ci_scripts/run_all.sh b/ci_scripts/run_all.sh index ae79262f8..dc3afc7f6 100755 --- a/ci_scripts/run_all.sh +++ b/ci_scripts/run_all.sh @@ -39,7 +39,6 @@ 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_NEW_TMP_EMAIL tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels popd diff --git a/python/tox.ini b/python/tox.ini index c33eff722..eeb4d2b88 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -13,7 +13,6 @@ passenv = TRAVIS DCC_RS_DEV DCC_RS_TARGET - DCC_PY_LIVECONFIG DCC_NEW_TMP_EMAIL CARGO_TARGET_DIR RUSTC_WRAPPER diff --git a/run-integration-tests.sh b/run-integration-tests.sh index 7aef0babb..1b26c5691 100755 --- a/run-integration-tests.sh +++ b/run-integration-tests.sh @@ -23,9 +23,6 @@ if [ $? != 0 ]; then fi pushd python -if [ -e "./liveconfig" -a -z "$DCC_PY_LIVECONFIG" ]; then - export DCC_PY_LIVECONFIG=liveconfig -fi tox "$@" ret=$? popd