Use pytest-flake8

dahlia · dahlia · commit f977194e60ff · 2017-06-21T17:05:49.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ install:
   - pip install -U pip setuptools docutils
   - pip install -e .[tests]
 script:
-  - pytest tests -v
-  - pip install 'typing<3.5.2' && pytest tests -v
+  - pytest -v
+  - pip install 'typing<3.5.2' && pytest -v
   - rst2html.py --strict CHANGES.rst
   - rst2html.py --strict README.rst
   - python setup.py --long-description | rst2html.py --strict
diff --git a/setup.py b/setup.py
@@ -40,9 +40,8 @@ def get_version():
 ] + service_requires
 tests_require = [
     'pytest >= 3.1.2, < 4.0.0',
+    'pytest-flake8 >= 0.8.1, < 1.0.0',
     'import-order',
-    'flake8',
-    'tox',
 ]
 docs_require = [
     'Sphinx',
diff --git a/tests/func_test.py b/tests/func_test.py
@@ -7,8 +7,8 @@
 
 def test_import_string():
     assert import_string('collections:OrderedDict') == collections.OrderedDict
-    assert import_string('collections:OrderedDict({"a": 1})') == \
-            collections.OrderedDict({"a": 1})
+    assert (import_string('collections:OrderedDict({"a": 1})') ==
+            collections.OrderedDict({"a": 1}))
     with raises(ValueError):
         # malformed
         import_string('world')
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@ envlist = py27,py34,py35,docs
 [testenv]
 deps = -e.[tests]
 commands=
-    pytest -v tests
+    pytest -v
 
 [testenv:docs]
 basepython = python3
@@ -13,3 +13,9 @@ commands =
     rst2html.py --strict CHANGES.rst
     rst2html.py --strict README.rst
     python3 setup.py --long-description | rst2html.py --strict
+
+[pytest]
+addopts = --ff --flake8
+
+[flake8]
+exclude = .env, .tox, tests/py2_nirum.py, tests/py3_nirum.py
