Merge 419deeb into a903495

.coveragerc

@@ -7,7 +7,6 @@ source =
 branch = true
 source =
     decaylanguage
-    tests
 parallel = true
 
 [report]

.travis.yml

@@ -14,7 +14,7 @@ matrix:
         - TOXENV=py27,report,coveralls
     - python: '3.5'
       env:
-        - TOXENV=py35,report,coveralls
+        - TOXENV=py35
     - python: '3.6'
       env:
         - TOXENV=py36,report,coveralls

setup.cfg

@@ -1,9 +1,8 @@
 [bdist_wheel]
 universal = 1
 
-[flake8]
-max-line-length = 140
-exclude = */migrations/*
+[aliases]
+test=pytest
 
 [tool:pytest]
 testpaths = tests
@@ -21,6 +20,10 @@ addopts =
     --doctest-glob=\*.rst
     --tb=short
 
+[flake8]
+max-line-length = 140
+exclude = */migrations/*
+
 [isort]
 force_single_line = True
 line_length = 120

setup.py

@@ -73,4 +73,6 @@ def read(*names, **kwargs):
         #   'rst': ['docutils>=0.11'],
         #   ':python_version=="2.6"': ['argparse'],
     },
+    setup_requires = ['pytest-runner'],
+    tests_require = ['pytest']
 )

tox.ini

@@ -26,7 +26,7 @@ deps =
     setuptools>=20.2
     graphviz
 commands =
-    {posargs:py.test --cov --cov-report=term-missing -vv tests}
+    {posargs:pytest --cov {envsitepackagesdir}/decaylanguage --cov-report=term-missing -vv tests}
 
 [testenv:bootstrap]
 deps =