From 81ffd0d0a8f6fd536ea0976aab0c02be759b9f1f Mon Sep 17 00:00:00 2001
From: John Bodley <john.bodley@airbnb.com>
Date: Mon, 16 Apr 2018 18:41:42 -0700
Subject: [PATCH 1/3] [setup] Dropping 3.4 and 3.6

---
 .travis.yml     | 40 +++++++++++++++++++++++++++++-----------
 UPDATING.md     |  1 +
 setup.py        |  2 +-
 superset/cli.py |  2 +-
 tox.ini         |  7 ++++---
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7398cf832b1e1..576d1a1d15a49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,36 @@
 language: python
+python:
+  - 2.7
+  - 3.6
 services:
-    - mysql
-    - postgres
-    - redis-server
+  - mysql
+  - postgres
+  - redis-server
 cache:
   - pip
-env:
-  - TOXENV=javascript
-  - TOXENV=flake8
-  - TOXENV=py27-mysql
-  - TOXENV=py27-sqlite
-  - TOXENV=py34-postgres
-  - TOXENV=py34-sqlite
-  - TOXENV=pylint
+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 e18409f89d081..9a8b9b83df079 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -7,3 +7,4 @@ assists people when migrating to a new version.
 
 * [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 c24d6f2bc57dd..2445703a00d35 100644
--- a/setup.py
+++ b/setup.py
@@ -104,7 +104,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 a40f06296801f..6321b5f18dbad 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -312,7 +312,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..d196806edf16b 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
 
@@ -79,6 +79,7 @@ envlist =
     flake8
     javascript
     py27
-    py34
+    py35
+    py36
     pylint
 skipsdist = true

From 42434a29bc360ea5077f26ac2e423fe3a1fc2064 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Mon, 16 Apr 2018 23:34:46 -0700
Subject: [PATCH 2/3] Update tox.ini

---
 tox.ini | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index d196806edf16b..d942be1fb1239 100644
--- a/tox.ini
+++ b/tox.ini
@@ -78,8 +78,5 @@ envlist =
     eslint
     flake8
     javascript
-    py27
-    py35
-    py36
     pylint
 skipsdist = true

From f74ad178d2d7e662d22c559b3e343a5748f46fc8 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Mon, 16 Apr 2018 23:53:23 -0700
Subject: [PATCH 3/3] Update .travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 576d1a1d15a49..16cdbb35bf3a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,8 @@ matrix:
     - python: 3.6
       env: TOXENV=pylint
   exclude:
-      - python: 2.7
-      - python: 3.6
+    - 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';"