Merge branch 'master' into develop

.circleci/config.yml

@@ -7,8 +7,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          - v1-dependencies-
+          - v1-dependencies-{{ checksum "VERSION.md" }}
       - run:
           name: Install npm dependencies
           command: npm install
@@ -21,7 +20,8 @@ jobs:
       - save_cache:
           paths:
             - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
+            - mopidy_iris
+          key: v1-dependencies-{{ checksum "VERSION.md" }}
   test:
     docker:
       - image: nikolaik/python-nodejs:python2.7-nodejs11
@@ -29,23 +29,25 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          - v1-dependencies-
+          - v1-dependencies-{{ checksum "VERSION.md" }}
       - run:
           name: Run tests
           command: npm run test
   deploy:
     docker:
-      - image: circleci/python:2.7
+      - image: nikolaik/python-nodejs:python2.7-nodejs11
     steps:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          - v1-dependencies-
+          - v1-dependencies-{{ checksum "VERSION.md" }}
       - 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

VERSION.md

@@ -1 +1 @@
-3.34.3
+3.35.0