From 275fd343fb82a7b92a6a3715cc7e1c042ba46b21 Mon Sep 17 00:00:00 2001
From: Edward Oakes <ed.nmi.oakes@gmail.com>
Date: Wed, 12 Feb 2020 11:15:47 -0800
Subject: [PATCH] Change CI to properly list python3.6 (#7126)

---
 .travis.yml                          | 10 +++++-----
 ci/travis/install-cython-examples.sh |  2 +-
 ci/travis/install-dependencies.sh    |  6 +++---
 ci/travis/install-ray.sh             |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 71f6c4a31..1e3f9f602 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,16 @@ dist: xenial
 matrix:
   include:
     - os: linux
-      env: PYTHON=3.5 PYTHONWARNINGS=ignore
+      env: PYTHON=3.6 PYTHONWARNINGS=ignore
 
     - os: osx
       osx_image: xcode7
-      env: PYTHON=3.5 PYTHONWARNINGS=ignore
+      env: PYTHON=3.6 PYTHONWARNINGS=ignore
 
     - os: linux
       env:
         - JDK='Oracle JDK 8'
-        - PYTHON=3.5 PYTHONWARNINGS=ignore
+        - PYTHON=3.6 PYTHONWARNINGS=ignore
         - RAY_INSTALL_JAVA=1
       install:
         - eval `python $TRAVIS_BUILD_DIR/ci/travis/determine_tests_to_run.py`
@@ -32,7 +32,7 @@ matrix:
         - TESTSUITE=streaming
         - JDK='Oracle JDK 8'
         - RAY_INSTALL_JAVA=1
-        - PYTHON=3.5 PYTHONWARNINGS=ignore
+        - PYTHON=3.6 PYTHONWARNINGS=ignore
       install:
         - python $TRAVIS_BUILD_DIR/ci/travis/determine_tests_to_run.py
         - eval `python $TRAVIS_BUILD_DIR/ci/travis/determine_tests_to_run.py`
@@ -52,7 +52,7 @@ matrix:
         - TESTSUITE=gcs_service
         - JDK='Oracle JDK 8'
         - RAY_GCS_SERVICE_ENABLED=true
-        - PYTHON=3.5 PYTHONWARNINGS=ignore
+        - PYTHON=3.6 PYTHONWARNINGS=ignore
         - RAY_INSTALL_JAVA=1
       install:
         - eval `python $TRAVIS_BUILD_DIR/ci/travis/determine_tests_to_run.py`
diff --git a/ci/travis/install-cython-examples.sh b/ci/travis/install-cython-examples.sh
index 30886ec5e..172f1d909 100755
--- a/ci/travis/install-cython-examples.sh
+++ b/ci/travis/install-cython-examples.sh
@@ -9,7 +9,7 @@ echo "PYTHON is $PYTHON"
 
 cython_examples="$ROOT_DIR/../../doc/examples/cython"
 
-if [[ "$PYTHON" == "3.5" ]]; then
+if [[ "$PYTHON" == "3.6" ]]; then
    export PATH="$HOME/miniconda/bin:$PATH"
 
    pushd $cython_examples
diff --git a/ci/travis/install-dependencies.sh b/ci/travis/install-dependencies.sh
index 3da738850..8bbd20dfa 100755
--- a/ci/travis/install-dependencies.sh
+++ b/ci/travis/install-dependencies.sh
@@ -17,7 +17,7 @@ else
   exit 1
 fi
 
-if [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then
+if [[ "$PYTHON" == "3.6" ]] && [[ "$platform" == "linux" ]]; then
   sudo apt-get update
   sudo apt-get install -y python-dev python-numpy build-essential curl unzip tmux gdb
   # Install miniconda.
@@ -28,7 +28,7 @@ if [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then
     feather-format lxml openpyxl xlrd py-spy pytest-timeout networkx tabulate aiohttp \
     uvicorn dataclasses pygments werkzeug kubernetes flask grpcio pytest-sugar pytest-rerunfailures pytest-asyncio \
     blist torch torchvision scikit-learn
-elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then
+elif [[ "$PYTHON" == "3.6" ]] && [[ "$platform" == "macosx" ]]; then
   # Install miniconda.
   wget -q https://repo.continuum.io/miniconda/Miniconda3-4.5.4-MacOSX-x86_64.sh -O miniconda.sh -nv
   bash miniconda.sh -b -p $HOME/miniconda
@@ -56,7 +56,7 @@ else
   exit 1
 fi
 
-if [[ "$PYTHON" == "3.5" ]] || [[ "$MAC_WHEELS" == "1" ]]; then
+if [[ "$PYTHON" == "3.6" ]] || [[ "$MAC_WHEELS" == "1" ]]; then
   # Install the latest version of Node.js in order to build the dashboard.
   source $HOME/.nvm/nvm.sh
   nvm install node
diff --git a/ci/travis/install-ray.sh b/ci/travis/install-ray.sh
index 34233cfa5..43740eab3 100755
--- a/ci/travis/install-ray.sh
+++ b/ci/travis/install-ray.sh
@@ -16,7 +16,7 @@ if [[ "$TRAVIS" == "true" ]]; then
   echo "build --jobs=50" >> $HOME/.bazelrc
 fi
 
-if [[ "$PYTHON" == "3.5" ]]; then
+if [[ "$PYTHON" == "3.6" ]]; then
   export PATH="$HOME/miniconda/bin:$PATH"
 
   pushd "$ROOT_DIR/../../python"