From cea6d3e4269b3ca1fa874acea5acdb277b5db266 Mon Sep 17 00:00:00 2001
From: Stephen Stack <sstack@punchthrough.com>
Date: Tue, 28 Mar 2017 15:37:01 -0500
Subject: [PATCH 1/2] circle: add deps for latest version of setuptools

---
 circle.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 21c909f..21c9c03 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,12 +18,17 @@ dependencies:
   cache_directories:
     - ~/.platformio
   override:
-    - pip install --upgrade pip setuptools virtualenv
-    - pip install cpplint
-    # Used for deployment
     - sudo apt-get update
     - sudo apt-get install doxygen
+    - pip install cpplint
+    - pip install six
+    - pip install packaging
+    - pip install appdirs
+    - pip install --upgrade pip setuptools virtualenv
+
+    # Used for deployment
     - npm install
+
     # Don't install PlatformIO if it's already been set up; it takes forever
     - if [ ! -f "~/.platformio/appstate.json" ]; then scripts/setup_platformio.sh; fi
 

From afb8a45f59ceb31c3e70935af2cdd89b6b37cb1e Mon Sep 17 00:00:00 2001
From: Stephen Stack <sstack@punchthrough.com>
Date: Wed, 29 Mar 2017 12:08:44 -0500
Subject: [PATCH 2/2] =?UTF-8?q?circle:=20don=E2=80=99t=20explicitly=20inst?=
 =?UTF-8?q?all=20setuptools/virtualenv/pip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 circle.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index 21c9c03..86a8d66 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,10 +21,6 @@ dependencies:
     - sudo apt-get update
     - sudo apt-get install doxygen
     - pip install cpplint
-    - pip install six
-    - pip install packaging
-    - pip install appdirs
-    - pip install --upgrade pip setuptools virtualenv
 
     # Used for deployment
     - npm install