mirror of
https://github.com/chatmail/core.git
synced 2026-05-09 01:46:30 +03:00
fix missing renames and tox dep
This commit is contained in:
@@ -35,8 +35,12 @@ ssh $SSHTARGET <<_HERE
|
|||||||
#rm -rf virtualenv venv
|
#rm -rf virtualenv venv
|
||||||
#virtualenv -q -p python3.7 venv
|
#virtualenv -q -p python3.7 venv
|
||||||
#source venv/bin/activate
|
#source venv/bin/activate
|
||||||
set -x
|
|
||||||
|
|
||||||
#pip install -q tox virtualenv
|
#pip install -q tox virtualenv
|
||||||
|
|
||||||
|
set -x
|
||||||
|
which python
|
||||||
|
source \$HOME/venv/bin/activate
|
||||||
|
which python
|
||||||
|
|
||||||
bash ci_scripts/run-python-test.sh
|
bash ci_scripts/run-python-test.sh
|
||||||
_HERE
|
_HERE
|
||||||
|
|||||||
@@ -19,4 +19,5 @@ rm -rf src/deltachat/__pycache__
|
|||||||
export PYTHONDONTWRITEBYTECODE=1
|
export PYTHONDONTWRITEBYTECODE=1
|
||||||
|
|
||||||
# run python tests (tox invokes pytest to run tests in python/tests)
|
# run python tests (tox invokes pytest to run tests in python/tests)
|
||||||
tox -e lintdoc,py37
|
TOX_PARALLEL_NO_SPINNER=1 tox -p2 -e lint,doc
|
||||||
|
tox -e py37
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ use deltachat::configure::*;
|
|||||||
use deltachat::contact::*;
|
use deltachat::contact::*;
|
||||||
use deltachat::context::*;
|
use deltachat::context::*;
|
||||||
use deltachat::job::{
|
use deltachat::job::{
|
||||||
perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
|
perform_inbox_fetch, perform_inbox_idle, perform_inbox_jobs, perform_smtp_idle,
|
||||||
|
perform_smtp_jobs,
|
||||||
};
|
};
|
||||||
use deltachat::Event;
|
use deltachat::Event;
|
||||||
|
|
||||||
@@ -50,12 +51,12 @@ fn main() {
|
|||||||
let r1 = running.clone();
|
let r1 = running.clone();
|
||||||
let t1 = thread::spawn(move || {
|
let t1 = thread::spawn(move || {
|
||||||
while *r1.read().unwrap() {
|
while *r1.read().unwrap() {
|
||||||
perform_imap_jobs(&ctx1);
|
perform_inbox_jobs(&ctx1);
|
||||||
if *r1.read().unwrap() {
|
if *r1.read().unwrap() {
|
||||||
perform_imap_fetch(&ctx1);
|
perform_inbox_fetch(&ctx1);
|
||||||
|
|
||||||
if *r1.read().unwrap() {
|
if *r1.read().unwrap() {
|
||||||
perform_imap_idle(&ctx1);
|
perform_inbox_idle(&ctx1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -113,7 +114,7 @@ fn main() {
|
|||||||
println!("stopping threads");
|
println!("stopping threads");
|
||||||
|
|
||||||
*running.clone().write().unwrap() = false;
|
*running.clone().write().unwrap() = false;
|
||||||
deltachat::job::interrupt_imap_idle(&ctx);
|
deltachat::job::interrupt_inbox_idle(&ctx, true);
|
||||||
deltachat::job::interrupt_smtp_idle(&ctx);
|
deltachat::job::interrupt_smtp_idle(&ctx);
|
||||||
|
|
||||||
println!("joining");
|
println!("joining");
|
||||||
|
|||||||
Reference in New Issue
Block a user