From dd8711e2d7cb13e7f4549b18119200685995efa2 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 11 Apr 2019 13:58:28 +1200
Subject: [PATCH 1/5] Preparing for real CircleCI release

---
 .circleci/config.yml | 6 +++++-
 VERSION.md           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7e11b37..b3e9fb2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,9 +34,13 @@ jobs:
       - run:
           name: Run tests
           command: npm run test
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
   deploy:
     docker:
-      - image: circleci/python:2.7
+      - image: nikolaik/python-nodejs:python2.7-nodejs11
     steps:
       - checkout
       - restore_cache:
diff --git a/VERSION.md b/VERSION.md
index 5019faed..aebeef10 100755
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-3.34.3
\ No newline at end of file
+3.35.0
\ No newline at end of file

From f534be1a5b59585c305c7c7a166a826c1c61757e Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 11 Apr 2019 14:11:39 +1200
Subject: [PATCH 2/5] Adding extra pypirc config

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3e9fb2c..02c43ecc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,6 +50,10 @@ jobs:
       - run:
           name: Prepare .pypirc
           command: |
+            echo -e "[distutils]" >> ~/.pypirc
+            echo -e "index-servers =" >> ~/.pypirc
+            echo -e " pypi" >> ~/.pypirc
+            echo -e "[distutils]" >> ~/.pypirc
             echo -e "[pypi]" >> ~/.pypirc
             echo -e "username = jaedb" >> ~/.pypirc
             echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc

From 384ebaca4ca70218ce8f6607c78cafc82dad4dc9 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 11 Apr 2019 14:26:06 +1200
Subject: [PATCH 3/5] Retaining build files for deployment

---
 .circleci/config.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02c43ecc..56baf7f9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,6 @@ jobs:
       - restore_cache:
           keys:
           - v1-dependencies-{{ checksum "package.json" }}
-          - v1-dependencies-
       - run:
           name: Install npm dependencies
           command: npm install
@@ -21,23 +20,16 @@ jobs:
       - save_cache:
           paths:
             - node_modules
+            - mopidy_iris
           key: v1-dependencies-{{ checksum "package.json" }}
   test:
     docker:
       - image: nikolaik/python-nodejs:python2.7-nodejs11
     steps:
       - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          - v1-dependencies-
       - run:
           name: Run tests
           command: npm run test
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
   deploy:
     docker:
       - image: nikolaik/python-nodejs:python2.7-nodejs11
@@ -46,7 +38,6 @@ jobs:
       - restore_cache:
           keys:
           - v1-dependencies-{{ checksum "package.json" }}
-          - v1-dependencies-
       - run:
           name: Prepare .pypirc
           command: |

From 83b7b3ef361daa36473099da8fc6feb437ca48c7 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 11 Apr 2019 14:31:58 +1200
Subject: [PATCH 4/5] Restore cache pre-test

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56baf7f9..059c6d90 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,6 +27,9 @@ jobs:
       - image: nikolaik/python-nodejs:python2.7-nodejs11
     steps:
       - checkout
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "package.json" }}
       - run:
           name: Run tests
           command: npm run test

From 32ecf53a7b888e60d813c4c7db33256dd8d090f7 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 11 Apr 2019 14:37:29 +1200
Subject: [PATCH 5/5] Using VERSION.md for checksum of cache

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 059c6d90..18ff55dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
+          - v1-dependencies-{{ checksum "VERSION.md" }}
       - run:
           name: Install npm dependencies
           command: npm install
@@ -21,7 +21,7 @@ jobs:
           paths:
             - node_modules
             - mopidy_iris
-          key: v1-dependencies-{{ checksum "package.json" }}
+          key: v1-dependencies-{{ checksum "VERSION.md" }}
   test:
     docker:
       - image: nikolaik/python-nodejs:python2.7-nodejs11
@@ -29,7 +29,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
+          - v1-dependencies-{{ checksum "VERSION.md" }}
       - run:
           name: Run tests
           command: npm run test
@@ -40,7 +40,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
+          - v1-dependencies-{{ checksum "VERSION.md" }}
       - run:
           name: Prepare .pypirc
           command: |