Merge pull request #1727 from mkg20001/feat-ci-mode

Add CI environment variable to disable download progress
kivy · Feb 25, 2019 · 8ebea2e · 8ebea2e
2 parents 593aa1e + 1ea1982
commit 8ebea2e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git 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"
diff --git 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
@@ -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)