From 855d410159e87a80f5fbd9e67e0d7f2949e19570 Mon Sep 17 00:00:00 2001 From: Jesse Zoldak Date: Fri, 5 Feb 2016 09:37:13 -0500 Subject: [PATCH] Update the Python version Other small changes: * output the list of installed python packages * tee the pylint output to the console so the build doesn't timeout when computing violations --- circle.yml | 8 ++++++-- scripts/circle-ci-tests.sh | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 95549be641..1c0903b615 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: python: - version: 2.7.3 + version: 2.7.10 general: artifacts: @@ -20,7 +20,7 @@ dependencies: # cache the virtualenv at that state, so that # the next build will not need to install them # from scratch again. - - pip install --exists-action w -r requirements/edx/pre.txt + - pip install --exists-action w -r requirements/edx/pre.txt - pip install --exists-action w -r requirements/edx/github.txt - pip install --exists-action w -r requirements/edx/local.txt @@ -34,6 +34,10 @@ dependencies: - pip install coveralls==1.0 + # Output the installed python packages to the console to help + # with troubleshooting any issues with python requirements. + - pip freeze + test: override: # Run tests for the system. diff --git a/scripts/circle-ci-tests.sh b/scripts/circle-ci-tests.sh index ad99eb827c..db992912e6 100755 --- a/scripts/circle-ci-tests.sh +++ b/scripts/circle-ci-tests.sh @@ -55,7 +55,9 @@ else paver run_pep8 > pep8.log || { cat pep8.log; EXIT=1; } echo "Finding pylint violations and storing in report..." - paver run_pylint -l $PYLINT_THRESHOLD > pylint.log || { cat pylint.log; EXIT=1; } + # HACK: we need to print something to the console, otherwise circleci + # fails and aborts the job because nothing is displayed for > 10 minutes. + paver run_pylint -l $PYLINT_THRESHOLD | tee pylint.log || EXIT=1 mkdir -p reports echo "Finding jshint violations and storing report..."