Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 13:26:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

python: remove DCC_PY_LIVECONFIG references from all scripts

Browse Source 
This variable is not used anymore.
This commit is contained in:
link2xt
2021-04-11 05:49:36 +03:00
committed by link2xt
parent ce4675e9f7
commit b5f2752e41
6 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci_scripts/old/run-python.sh
View File

@@ -45,7 +45,6 @@ if [ -n "$TESTS" ]; then
# messages and rust's imap code likely has concurrency problems) # 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 "not qr"
tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr" tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
unset DCC_PY_LIVECONFIG
unset DCC_NEW_TMP_EMAIL unset DCC_NEW_TMP_EMAIL
tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
tox --workdir "$TOXWORKDIR" -e auditwheels tox --workdir "$TOXWORKDIR" -e auditwheels

3
ci_scripts/remote_python_packaging.sh
View File

@@ -30,12 +30,11 @@ ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE
set +x -e set +x -e
shopt -s huponexit shopt -s huponexit
cd $BUILDDIR cd $BUILDDIR
export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
set -x set -x
# run everything else inside docker # 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 \ --rm -it -v \$(pwd):/mnt -w /mnt \
deltachat/coredeps ci_scripts/run_all.sh deltachat/coredeps ci_scripts/run_all.sh

1
ci_scripts/remote_tests_python.sh
View File

@@ -29,7 +29,6 @@ ssh $SSHTARGET <<_HERE
export RUSTC_WRAPPER=\`which sccache\` export RUSTC_WRAPPER=\`which sccache\`
cd $BUILDDIR cd $BUILDDIR
export TARGET=release export TARGET=release
export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
#we rely on tox/virtualenv being available in the host #we rely on tox/virtualenv being available in the host

1
ci_scripts/run_all.sh
View File

@@ -39,7 +39,6 @@ mkdir -p $TOXWORKDIR
# XXX we may switch on some live-tests on for better ensurances # XXX we may switch on some live-tests on for better ensurances
# Note that the independent remote_tests_python step does all kinds of # Note that the independent remote_tests_python step does all kinds of
# live-testing already. # live-testing already.
unset DCC_PY_LIVECONFIG
unset DCC_NEW_TMP_EMAIL unset DCC_NEW_TMP_EMAIL
tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels
popd popd

1
python/tox.ini
View File

@@ -13,7 +13,6 @@ passenv =
TRAVIS TRAVIS
DCC_RS_DEV DCC_RS_DEV
DCC_RS_TARGET DCC_RS_TARGET
DCC_PY_LIVECONFIG
DCC_NEW_TMP_EMAIL DCC_NEW_TMP_EMAIL
CARGO_TARGET_DIR CARGO_TARGET_DIR
RUSTC_WRAPPER RUSTC_WRAPPER

3
run-integration-tests.sh
View File

@@ -23,9 +23,6 @@ if [ $? != 0 ]; then
fi fi
pushd python pushd python
if [ -e "./liveconfig" -a -z "$DCC_PY_LIVECONFIG" ]; then
export DCC_PY_LIVECONFIG=liveconfig
fi
tox "$@" tox "$@"
ret=$? ret=$?
popd popd