From 903528711d972599c5eddb5b64a5d94366f6a73a Mon Sep 17 00:00:00 2001 From: mkg20001 Date: Tue, 2 May 2017 16:00:12 +0200 Subject: [PATCH 1/2] feat: add ci_mode to disable download progress Otherwise Travis CI complains about log size --- pythonforandroid/logger.py | 11 ++++++----- pythonforandroid/recipe.py | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py index d7914cee38..4aba39fcab 100644 --- a/pythonforandroid/logger.py +++ b/pythonforandroid/logger.py @@ -188,11 +188,12 @@ def shprint(command, *args, **kwargs): '\t', ' ').replace( '\b', ' ').rstrip() if msg: - stdout.write(u'{}\r{}{:<{width}}'.format( - Err_Style.RESET_ALL, msg_hdr, - shorten_string(msg, msg_width), width=msg_width)) - stdout.flush() - need_closing_newline = True + if "CI" not in os.environ: + stdout.write(u'{}\r{}{:<{width}}'.format( + Err_Style.RESET_ALL, msg_hdr, + shorten_string(msg, msg_width), width=msg_width)) + stdout.flush() + need_closing_newline = True else: logger.debug(''.join(['\t', line.rstrip()])) if need_closing_newline: diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py index 7b5ec9320d..3af56b2690 100644 --- a/pythonforandroid/recipe.py +++ b/pythonforandroid/recipe.py @@ -140,8 +140,9 @@ def report_hook(index, blksize, size): else: progression = '{0:.2f}%'.format( index * blksize * 100. / float(size)) - stdout.write('- Download {}\r'.format(progression)) - stdout.flush() + if "CI" not in environ: + stdout.write('- Download {}\r'.format(progression)) + stdout.flush() if exists(target): unlink(target) From 1ea1982ab4b4e84f4e71d04f1c17cb2233efc52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 25 Feb 2019 20:43:00 +0100 Subject: [PATCH 2/2] feat: travis ci $CI flag That commit message ^^ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d857dc03bc..b90b3a30c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,4 +32,4 @@ before_script: script: - docker build --tag=p4a --file Dockerfile.py3 . - - docker run p4a /bin/sh -c "$COMMAND" + - docker run -e CI p4a /bin/sh -c "$COMMAND"