From ee3c8f3903effec0f456794512dd2c8fd2d8bc32 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Tue, 17 Apr 2018 21:30:12 -0700
Subject: [PATCH] [cherry-pick] Cherry-picking w/ overrides

---
 .travis.yml     | 42 +++++++++++++++++++++++++++++-------------
 UPDATING.MD     |  5 ++++-
 setup.py        |  2 +-
 superset/cli.py |  2 +-
 tox.ini         |  6 ++----
 5 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fc30037e9648..16cdbb35bf3a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,36 @@
 language: python
+python:
+  - 2.7
+  - 3.6
 services:
-    - mysql
-    - postgres
-    - redis-server
+  - mysql
+  - postgres
+  - redis-server
 cache:
   - pip
-env:
-  - TOXENV=javascript
-  - TOXENV=py27-flake8
-  - TOXENV=py27-mysql
-  - TOXENV=py27-sqlite
-  - TOXENV=py27-pylint
-  - TOXENV=py34-flake8
-  - TOXENV=py34-postgres
-  - TOXENV=py34-pylint
-  - TOXENV=py34-sqlite
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=flake8
+    - python: 2.7
+      env: TOXENV=py27-mysql
+    - python: 2.7
+      env: TOXENV=py27-sqlite
+    - python: 2.7
+      env: TOXENV=pylint
+    - python: 3.6
+      env: TOXENV=flake8
+    - python: 3.6
+      env: TOXENV=javascript
+    - python: 3.6
+      env: TOXENV=py36-postgres
+    - python: 3.6
+      env: TOXENV=py36-sqlite
+    - python: 3.6
+      env: TOXENV=pylint
+  exclude:
+    - python: 2.7
+    - python: 3.6
 before_script:
   - mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
   - mysql -u root -e "CREATE USER 'mysqluser'@'localhost' IDENTIFIED BY 'mysqluserpassword';"
diff --git a/UPDATING.MD b/UPDATING.MD
index 7fb3e852ec4b1..bd3a734656949 100644
--- a/UPDATING.MD
+++ b/UPDATING.MD
@@ -5,4 +5,7 @@ assists people when migrating to a new version.
 
 ## Superset 0.23.0
 
-* [4565](https://github.com/apache/incubator-superset/pull/4565)
\ No newline at end of file
+* [4565](https://github.com/apache/incubator-superset/pull/4565)
+* [4565](https://github.com/apache/incubator-superset/pull/4565)
+* [4587](https://github.com/apache/incubator-superset/pull/4587)
+* [4835](https://github.com/apache/incubator-superset/pull/4835)
diff --git a/setup.py b/setup.py
index 43f0c4abaa629..0e7f05a117ae4 100644
--- a/setup.py
+++ b/setup.py
@@ -103,7 +103,7 @@ def get_git_sha():
     ),
     classifiers=[
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )
diff --git a/superset/cli.py b/superset/cli.py
index dc11e2cc69822..02ef243f68816 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -279,7 +279,7 @@ def update_datasources_cache():
             database.all_table_names(force=True)
             database.all_view_names(force=True)
         except Exception as e:
-            print('{}'.format(e.message))
+            print('{}'.format(str(e)))
 
 
 @manager.option(
diff --git a/tox.ini b/tox.ini
index fba53956ac384..d942be1fb1239 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,8 +37,8 @@ setenv =
     SUPERSET_HOME = {envtmpdir}
     py27-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset=utf8
     py34-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset
-    {py27,py34}-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://postgresuser:pguserpassword@localhost/superset
-    {py27,py34}-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db
+    py{27,34,36}-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://postgresuser:pguserpassword@localhost/superset
+    py{27,34,36}-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db
 whitelist_externals =
     npm
 
@@ -78,7 +78,5 @@ envlist =
     eslint
     flake8
     javascript
-    py27
-    py34
     pylint
 skipsdist = true