From 2c17a653fea41f89c6777d9f5de53794ee177d8e Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Sun, 22 Jul 2018 08:26:22 -0700
Subject: [PATCH 1/6] Move flake8-related packages deps to reqs-dev.txt

My VIM which is integrated with flake8 wouldn't match the output from
travis and would often miss things related to the flake8 plugins
installed using Tox.

By moving this to requirements-dev.txt, we can expect developers would
have the proper configuration locally and get matching results with
Travis when running flake8 or in their IDEs if its integrated with
flake8..
---
 requirements-dev.txt | 8 +++++++-
 tox.ini              | 7 +------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 54fe2f06816a0..411ab6344fbc9 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,9 +1,15 @@
 flask-cors==3.0.3
 ipdb==0.11
 mysqlclient==1.3.12
-psycopg2==2.7.4
+psycopg2-binary==2.7.5
 redis==2.10.6
 statsd==3.2.2
 tox==3.1.2
 console_log==0.2.10
 pylint==1.9.2
+flake8==3.5.0
+flake8-coding==1.3.0
+flake8-commas==2.0.0
+flake8-future-import==0.4.5
+flake8-import-order==0.18
+flake8-quotes==1.0.0
diff --git a/tox.ini b/tox.ini
index 464ab1b8ce623..655236ad75b62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,12 +53,7 @@ deps =
 commands =
     flake8
 deps =
-    flake8
-    flake8-coding
-    flake8-commas
-    flake8-future-import
-    flake8-import-order
-    flake8-quotes
+    -rrequirements-dev.txt
 
 [testenv:javascript]
 commands =

From 76ddcf89fa74c1b8a3b252cf6a1da3a068f67420 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Sun, 22 Jul 2018 09:33:20 -0700
Subject: [PATCH 2/6] merging migratinos

---
 superset/migrations/versions/e3970889f38e_.py | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 superset/migrations/versions/e3970889f38e_.py

diff --git a/superset/migrations/versions/e3970889f38e_.py b/superset/migrations/versions/e3970889f38e_.py
new file mode 100644
index 0000000000000..abbee363d84a1
--- /dev/null
+++ b/superset/migrations/versions/e3970889f38e_.py
@@ -0,0 +1,22 @@
+"""empty message
+
+Revision ID: e3970889f38e
+Revises: ('4451805bbaa1', '1d9e835a84f9')
+Create Date: 2018-07-22 09:32:36.986561
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e3970889f38e'
+down_revision = ('4451805bbaa1', '1d9e835a84f9')
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass

From 0528c2c146254b02387abe5ef01fc16e7c55c268 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Sun, 22 Jul 2018 20:37:59 -0700
Subject: [PATCH 3/6] sorting packages

---
 requirements-dev.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 411ab6344fbc9..979be5ef2e11e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,15 +1,15 @@
+console_log==0.2.10
+flake8-coding==1.3.0
+flake8-commas==2.0.0
+flake8-future-import==0.4.5
+flake8-import-order==0.18
+flake8-quotes==1.0.0
+flake8==3.5.0
 flask-cors==3.0.3
 ipdb==0.11
 mysqlclient==1.3.12
 psycopg2-binary==2.7.5
+pylint==1.9.2
 redis==2.10.6
 statsd==3.2.2
 tox==3.1.2
-console_log==0.2.10
-pylint==1.9.2
-flake8==3.5.0
-flake8-coding==1.3.0
-flake8-commas==2.0.0
-flake8-future-import==0.4.5
-flake8-import-order==0.18
-flake8-quotes==1.0.0

From 8f2fadbfb1475a80dc04a59f942cb89a40006a55 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 23 Jul 2018 10:29:02 -0700
Subject: [PATCH 4/6] Specify folder for flake8 processing

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 655236ad75b62..06015d7eddc1f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,7 +51,7 @@ deps =
 
 [testenv:flake8]
 commands =
-    flake8
+    flake8 {toxinidir}/
 deps =
     -rrequirements-dev.txt
 

From bf0337b7e5313e70ab516fda3d5654bd481db827 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 23 Jul 2018 10:37:12 -0700
Subject: [PATCH 5/6] pin pycodestyle==2.3.1

---
 requirements-dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 979be5ef2e11e..fdb627d96207d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -9,6 +9,7 @@ flask-cors==3.0.3
 ipdb==0.11
 mysqlclient==1.3.12
 psycopg2-binary==2.7.5
+pycodestyle==2.3.1
 pylint==1.9.2
 redis==2.10.6
 statsd==3.2.2

From 2f1acfb1a1712736e2d3e470e6bc3c650f482688 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 23 Jul 2018 11:21:05 -0700
Subject: [PATCH 6/6] merge db migrations

---
 superset/migrations/versions/46ba6aaaac97_.py | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 superset/migrations/versions/46ba6aaaac97_.py

diff --git a/superset/migrations/versions/46ba6aaaac97_.py b/superset/migrations/versions/46ba6aaaac97_.py
new file mode 100644
index 0000000000000..eb0a7aacaa34b
--- /dev/null
+++ b/superset/migrations/versions/46ba6aaaac97_.py
@@ -0,0 +1,22 @@
+"""empty message
+
+Revision ID: 46ba6aaaac97
+Revises: ('705732c70154', 'e3970889f38e')
+Create Date: 2018-07-23 11:20:54.929246
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '46ba6aaaac97'
+down_revision = ('705732c70154', 'e3970889f38e')
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass