jenkins-bot merged this change.

View Change

Move flake8 dependencies to setup.py

This will provide developers with an easier way of installing flake8
dependencies (`pip install -e .[flake8]`).
I574a92dd7fb can be abandoned if this change-set is accepted.

Bug: T193476
Change-Id: Id023e8711bb7192d13e08aabcdc063359fee5bd9
---
M setup.py
M tox.ini
2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/setup.py b/setup.py
index 3e6dd14..5572b63 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,23 @@
     'security': ['requests[security]', 'pycparser!=2.14'],
     'mwoauth': ['mwoauth>=0.2.4,!=0.3.1'],
     'html': ['BeautifulSoup4'],
+    'flake8': [  # Due to incompatibilities between packages the order matters.
+        'flake8>=3.0.2',
+        'pydocstyle',
+        'hacking',
+        'flake8-coding',
+        'flake8-comprehensions',
+        'flake8-docstrings>=1.1.0',
+        'flake8-future-import',
+        'flake8-invalid-escape-sequences',
+        'flake8-mock>=0.3',
+        'flake8-per-file-ignores',
+        'flake8-print>=2.0.1',
+        'flake8-string-format',
+        'flake8-tuple>=0.2.8',
+        'pep8-naming>=0.7',
+        'pyflakes>=1.1',
+    ]
 }
 
 if PY2:
diff --git a/tox.ini b/tox.ini
index e696d43..715c397 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,24 +51,10 @@
 
 [testenv:flake8]
 commands =
+    pip install -e .[flake8]
     flake8 --version
     flake8 --doctests {posargs}
 basepython = python2.7
-deps = flake8 >= 3.0.2
-       pyflakes >= 1.1
-       pydocstyle
-       hacking
-       flake8-docstrings>=1.1.0
-       flake8-per-file-ignores
-       flake8-coding
-       flake8-comprehensions
-       flake8-future-import
-       flake8-string-format
-       flake8-tuple>=0.2.8
-       flake8-print>=2.0.1
-       flake8-mock>=0.3
-       pep8-naming>=0.7
-       flake8-invalid-escape-sequences
 
 # 4a226d07 is https://github.com/erikrose/blessings/pull/104
 [testenv:flake8-diff]

To view, visit change 434317. To unsubscribe, visit settings.