From d23b021df6a7f396523ae4803596f59b579056a3 Mon Sep 17 00:00:00 2001
From: Jesse Zoldak <zoldak@edx.org>
Date: Fri, 5 Feb 2016 09:15:32 -0500
Subject: [PATCH 1/2] Bump the version of edx-search

---
 requirements/edx/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index fd78a233ca..d3560ad7d4 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -37,7 +37,7 @@ djangorestframework-jwt==1.7.2
 edx-opaque-keys==0.2.1
 edx-organizations==0.3.1
 edx-rest-api-client==1.2.1
-edx-search==0.1.1
+edx-search==0.1.2
 facebook-sdk==0.4.0
 feedparser==5.1.3
 firebase-token-generator==1.3.2

From 855d410159e87a80f5fbd9e67e0d7f2949e19570 Mon Sep 17 00:00:00 2001
From: Jesse Zoldak <zoldak@edx.org>
Date: Fri, 5 Feb 2016 09:37:13 -0500
Subject: [PATCH 2/2] 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..."