From 1984dac41990e783d6ba0f510fdf7f5ba5789c24 Mon Sep 17 00:00:00 2001
From: Joel Nothman <joel.nothman@gmail.com>
Date: Sat, 21 Jul 2018 02:11:20 +1000
Subject: [PATCH] MAINT CI [scipy-dev] now uses python 3.7 (#11409)

---
 build_tools/travis/install.sh | 18 +++++++++---------
 setup.py                      |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build_tools/travis/install.sh b/build_tools/travis/install.sh
index c294ba29c09f3..d41e746a1ab2e 100755
--- a/build_tools/travis/install.sh
+++ b/build_tools/travis/install.sh
@@ -24,7 +24,8 @@ export CXX=/usr/lib/ccache/g++
 # ~60M is used by .ccache when compiling from scratch at the time of writing
 ccache --max-size 100M --show-stats
 
-if [[ "$DISTRIB" == "conda" ]]; then
+make_conda() {
+	TO_INSTALL="$@"
     # Deactivate the travis-provided virtual environment and setup a
     # conda-based environment instead
     deactivate
@@ -37,6 +38,11 @@ if [[ "$DISTRIB" == "conda" ]]; then
     export PATH=$MINICONDA_PATH/bin:$PATH
     conda update --yes conda
 
+    conda create -n testenv --yes $TO_INSTALL
+    source activate testenv
+}
+
+if [[ "$DISTRIB" == "conda" ]]; then
     TO_INSTALL="python=$PYTHON_VERSION pip pytest pytest-cov \
                 numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
                 cython=$CYTHON_VERSION"
@@ -62,9 +68,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
     if [[ -n "$JOBLIB_VERSION" ]]; then
         TO_INSTALL="$TO_INSTALL joblib=$JOBLIB_VERSION"
     fi
-
-    conda create -n testenv --yes $TO_INSTALL
-    source activate testenv
+	  make_conda $TO_INSTALL
 
     # for python 3.4, conda does not have recent pytest packages
     if [[ "$PYTHON_VERSION" == "3.4" ]]; then
@@ -83,11 +87,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
     pip install pytest pytest-cov cython==$CYTHON_VERSION
 
 elif [[ "$DISTRIB" == "scipy-dev" ]]; then
-    # Set up our own virtualenv environment to avoid travis' numpy.
-    # This venv points to the python interpreter of the travis build
-    # matrix.
-    virtualenv --python=python ~/testvenv
-    source ~/testvenv/bin/activate
+    make_conda python=3.7
     pip install --upgrade pip setuptools
 
     echo "Installing numpy and scipy master wheels"
diff --git a/setup.py b/setup.py
index 530ec899dc406..e25c50a114a33 100755
--- a/setup.py
+++ b/setup.py
@@ -189,6 +189,7 @@ def setup_package():
                                  'Programming Language :: Python :: 3.4',
                                  'Programming Language :: Python :: 3.5',
                                  'Programming Language :: Python :: 3.6',
+                                 'Programming Language :: Python :: 3.7',
                                  ('Programming Language :: Python :: '
                                   'Implementation :: CPython'),
                                  ('Programming Language :: Python :: '