Merge branch 'master' into add_style_to_snapshot_tests

ocadotechnology · Apr 20, 2018 · 7fbeba8 · 7fbeba8
2 parents 9973f83 + 76abd3e
commit 7fbeba8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,8 @@ jobs:
           # Download kubectl, which is a requirement for using minikube.
           - curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
           # Download minikube.
-          - curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
-          - sudo minikube start --vm-driver=none --kubernetes-version=v1.9.0
+          - curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.2/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+          - sudo minikube start --vm-driver=none --kubernetes-version=v1.7.0
           # Fix the kubectl context, as it's often stale.
           - minikube update-context
           # Wait for Kubernetes to be up and ready.

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
         'httmock',
         'mock == 2.0.0',
         'docker == 2.7.0',
-        'kubernetes == 4.0.0',
+        'kubernetes == 5.0.0',
         'PyYAML == 3.12',
     ],
     test_suite='setuptest.setuptest.SetupTestSuite',