diff --git a/.travis.yml b/.travis.yml index 5dfdae00..95d9c64c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ cache: - /home/travis/virtualenv install: -- pip install -r dev_requirements.txt +# |cat to disable progress bar. +- pip install -r dev_requirements.txt |cat script: - | diff --git a/.travis/ci_lib.py b/.travis/ci_lib.py index eb130a14..e92564b6 100644 --- a/.travis/ci_lib.py +++ b/.travis/ci_lib.py @@ -32,6 +32,17 @@ def subprocess__check_output(*popenargs, **kwargs): if not hasattr(subprocess, 'check_output'): subprocess.check_output = subprocess__check_output + +# ----------------- + +# Force stdout FD 1 to be a pipe, so tools like pip don't spam progress bars. + +sys.stdout = os.popen('stdbuf -oL cat', 'w', 1) +os.dup2(sys.stdout.fileno(), 1) + +sys.stderr = sys.stdout +os.dup2(sys.stderr.fileno(), 2) + # ----------------- def _argv(s, *args): diff --git a/.travis/debops_common_tests.sh b/.travis/debops_common_tests.sh index 50e67ada..753d1c11 100755 --- a/.travis/debops_common_tests.sh +++ b/.travis/debops_common_tests.sh @@ -27,7 +27,7 @@ mkdir "$TMPDIR" echo travis_fold:start:job_setup -pip install -qqqU debops==0.7.2 ansible==${ANSIBLE_VERSION} +pip install -qqqU debops==0.7.2 ansible==${ANSIBLE_VERSION} |cat debops-init "$TMPDIR/project" cd "$TMPDIR/project" diff --git a/dev_requirements.txt b/dev_requirements.txt index 972dbcb3..a6807488 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -5,6 +5,7 @@ Django==1.6.11 # Last version supporting 2.6. mock==2.0.0 pytz==2018.5 paramiko==2.3.2 # Last 2.6-compat version. +cffi==1.11.2 # Random pin to try and fix pyparser==2.18 not having effect pycparser==2.18 # Last version supporting 2.6. pytest-catchlog==1.2.2 pytest==3.1.2