From cae1a4ce2e3a2607b5d93d4699e7a03f9903acc1 Mon Sep 17 00:00:00 2001
From: Luiz Scheinkman <lscheinkman@numenta.com>
Date: Tue, 10 Apr 2018 10:02:05 -0700
Subject: [PATCH] Fix circleci buid

---
 ci/circle/before_install-osx.sh | 42 ---------------------------------
 circle.yml                      |  6 +++--
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100755 ci/circle/before_install-osx.sh

diff --git a/ci/circle/before_install-osx.sh b/ci/circle/before_install-osx.sh
deleted file mode 100755
index 31f3728f82..0000000000
--- a/ci/circle/before_install-osx.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# ----------------------------------------------------------------------
-# Numenta Platform for Intelligent Computing (NuPIC)
-# Copyright (C) 2013-5, Numenta, Inc.  Unless you have an agreement
-# with Numenta, Inc., for a separate license for this software code, the
-# following terms and conditions apply:
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU Affero Public License for more details.
-#
-# You should have received a copy of the GNU Affero Public License
-# along with this program.  If not, see http://www.gnu.org/licenses.
-#
-# http://numenta.org/licenses/
-# ----------------------------------------------------------------------
-
-echo
-echo Running before_install-osx.sh...
-echo
-
-#if [ $CC = 'gcc' ]; then
-#    export CC='gcc-4.8'
-#    export CXX='g++-4.8'
-#fi
-
-#if [ $CC = 'clang' ]; then
-#    export CC='clang'
-#    export CXX='clang++'
-#fi
-
-echo "Installing pip, setuptools, and wheel"
-sudo pip install --upgrade pip
-pip install --upgrade --user --ignore-installed setuptools wheel
-
-echo "Installing Python dependencies"
-pip install --use-wheel --user -r bindings/py/requirements.txt  --quiet || exit
diff --git a/circle.yml b/circle.yml
index 3d856fd3fd..c1d123f30d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,7 +11,8 @@ machine:
     PATH: "$HOME/Library/Python/2.7/bin:$PATH"
     PYBIN: "$HOME/Library/Python/2.7/bin"
   pre:
-    - sudo pip install --ignore-installed --upgrade --verbose virtualenv
+    - curl https://bootstrap.pypa.io/get-pip.py | sudo -H python
+    - sudo -H pip install --ignore-installed --upgrade --verbose virtualenv
     # Link virtualenv to /usr/local/bin if it doesn't exist and always give exit status of 0.
     - "([ ! -e /usr/local/bin/virtualenv ] && ln -s ~/Library/Python/2.7/bin/virtualenv /usr/local/bin/virtualenv) || true"
     - if [[ "$OSTYPE" != "darwin"* ]]; then echo "Must set option to use OS X in CircleCI Web UI" && exit 1; fi
@@ -19,7 +20,8 @@ machine:
 dependencies:
   override:
     # Install all dependencies
-    - ./ci/circle/before_install-osx.sh
+    - pip install --user --upgrade --verbose setuptools setuptools-scm
+    - pip install --use-wheel --no-cache-dir --user -r bindings/py/requirements.txt  --verbose || exit
 
 compile:
   override: