Test JupyterHub's master branch

Author: consideRatio

.travis.yml

@@ -16,14 +16,20 @@ install:
   # of dependencies, and only pin kubernetes if $KUBE_PY is specified.
   - pip install --upgrade setuptools pip
   - pip install -e ".[test]" ${PRE_RELEASES:+--pre} ${KUBE_PY:+kubernetes==${KUBE_PY}}
+<<<<<<< HEAD
 
+=======
+>>>>>>> 91d1d60... Test JupyterHub's master branch
   # Allow for testing against the jupyterhub master branch as well
   - |
       if [ "$JUPYTERHUB_MASTER" == "TRUE" ]; then
         pip install https://github.com/jupyterhub/jupyterhub/archive/master.zip
       fi
+<<<<<<< HEAD
 
   # Log installed python packages' versions
+=======
+>>>>>>> 91d1d60... Test JupyterHub's master branch
   - pip freeze
 
 # run tests
@@ -61,12 +67,10 @@ jobs:
 
     - name: client:9,k8s:1.13
       env: KUBE_PY=9 KUBE_VERSION=1.13.12
-      dist: xenial
-      # NOTE: TravisCI's linux kernel, has since 2020 or so, when specifying
-      #       bionic as a distribution, made minikube fail to start a k8s 1.13
-      #       cluster. This is why we use xenial here.
-      # Reference - a build failure with bionic:
-      #       https://travis-ci.org/jupyterhub/kubespawner/jobs/642305915
+    - python: 3.6
+      env: &latest_supported KUBE_PY=10 KUBE_VERSION=1.14.9
+    - python: 3.6
+      env: KUBE_PY=10 KUBE_VERSION=1.14.9 JUPYTERHUB_MASTER=TRUE
 
     - name: client:10,k8s:1.14,py:37
       env: KUBE_PY=10 KUBE_VERSION=1.14.0