From fee5023269cf09bc7012a77f4385fa03e5ce54f9 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 23 Jul 2018 12:29:21 -0700
Subject: [PATCH] Move flake8-related packages deps to reqs-dev.txt (#5460)

* 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..

* merging migratinos

* sorting packages

* Specify folder for flake8 processing

* pin pycodestyle==2.3.1

* merge db migrations
---
 requirements-dev.txt                          | 13 ++++++++---
 superset/migrations/versions/46ba6aaaac97_.py | 22 +++++++++++++++++++
 superset/migrations/versions/e3970889f38e_.py | 22 +++++++++++++++++++
 tox.ini                                       |  9 ++------
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 superset/migrations/versions/46ba6aaaac97_.py
 create mode 100644 superset/migrations/versions/e3970889f38e_.py

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 54fe2f06816a0..fdb627d96207d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,9 +1,16 @@
+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==2.7.4
+psycopg2-binary==2.7.5
+pycodestyle==2.3.1
+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
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
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
diff --git a/tox.ini b/tox.ini
index 464ab1b8ce623..06015d7eddc1f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,14 +51,9 @@ deps =
 
 [testenv:flake8]
 commands =
-    flake8
+    flake8 {toxinidir}/
 deps =
-    flake8
-    flake8-coding
-    flake8-commas
-    flake8-future-import
-    flake8-import-order
-    flake8-quotes
+    -rrequirements-dev.txt
 
 [testenv:javascript]
 commands =