From 9805abde444e2e276cdfc88ffd6997a108a9fb79 Mon Sep 17 00:00:00 2001
From: micbou <contact@micbou.com>
Date: Sun, 15 Apr 2018 16:35:01 +0200
Subject: [PATCH 1/2] Do not update pip on Travis and CircleCI

---
 .circleci/install_dependencies.sh | 1 -
 ci/travis/travis_install.sh       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.circleci/install_dependencies.sh b/.circleci/install_dependencies.sh
index 3071ff2f..af9cd4e0 100755
--- a/.circleci/install_dependencies.sh
+++ b/.circleci/install_dependencies.sh
@@ -73,7 +73,6 @@ if [ -z \"\${PYENV_LOADING}\" ]; then
   unset PYENV_LOADING
 fi" >> $BASH_ENV
 
-pip install -U pip wheel setuptools
 pip install -r python/test_requirements.txt
 
 set +e
diff --git a/ci/travis/travis_install.sh b/ci/travis/travis_install.sh
index 9436c750..fc93e414 100644
--- a/ci/travis/travis_install.sh
+++ b/ci/travis/travis_install.sh
@@ -63,7 +63,6 @@ python_version=$(python -c 'import sys; print( "{0}.{1}".format( sys.version_inf
 echo "Checking python version (actual ${python_version} vs expected ${YCM_PYTHON_VERSION})"
 test ${python_version} == ${YCM_PYTHON_VERSION}
 
-pip install -U pip wheel setuptools
 pip install -r python/test_requirements.txt
 
 # The build infrastructure prints a lot of spam after this script runs, so make

From 88ca541893d61416f4b5fcc0e6b000b8683082af Mon Sep 17 00:00:00 2001
From: micbou <contact@micbou.com>
Date: Mon, 16 Apr 2018 17:43:46 +0200
Subject: [PATCH 2/2] Fix pip cache directory on CircleCI

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 808f8c42..79c40820 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,14 +22,14 @@ aliases:
   # Increase the version key to clear the cache.
   save-cache: &save-cache
     save_cache:
-      key: v1-ycm-{{ .Environment.CIRCLE_JOB }}
+      key: v2-ycm-{{ .Environment.CIRCLE_JOB }}
       paths:
         - ~/Library/Caches/Homebrew
-        - ~/.cache/pip
+        - ~/Library/Caches/pip
         - ~/.pyenv
   restore-cache: &restore-cache
     restore_cache:
-      key: v1-ycm-{{ .Environment.CIRCLE_JOB }}
+      key: v2-ycm-{{ .Environment.CIRCLE_JOB }}
 jobs:
   python2:
     <<: *common