From c14ca5cc83f6168f16cfb5567f8b472db86333be Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 16 Jul 2018 11:46:13 -0700
Subject: [PATCH] Fix the build (#5403)

The travis build has been failing for 2 reasons recently
* pylint takes > 10 minutes without outputing
* bad merge confict auto resolve in controls.jsx
---
 requirements-dev.txt                     | 3 ++-
 superset/assets/src/explore/controls.jsx | 1 -
 tox.ini                                  | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7f9616395e683..54fe2f06816a0 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,5 +4,6 @@ mysqlclient==1.3.12
 psycopg2==2.7.4
 redis==2.10.6
 statsd==3.2.2
-tox==2.9.1
+tox==3.1.2
 console_log==0.2.10
+pylint==1.9.2
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 9f5079c40c7f5..ecd0ba052069f 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -208,7 +208,6 @@ export const controls = {
     multi: true,
     default: [],
     label: t('Percentage Metrics'),
-    default: [],
     validators: [],
     description: t('Metrics for which percentage of total are to be displayed'),
   },
diff --git a/tox.ini b/tox.ini
index 2b2678eae4465..36fd523156c34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -71,12 +71,10 @@ commands =
 deps =
     -rrequirements.txt
     -rrequirements-dev.txt
-    pylint
 
 [tox]
 envlist =
     eslint
     flake8
     javascript
-    pylint
 skipsdist = true