From 64bcca68411e2f32400aca2f17c988dc1092b5d7 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Thu, 19 Jul 2018 12:44:46 +0200
Subject: [PATCH 1/2] Adding test runner

---
 .travis.yml | 2 +-
 setup.cfg   | 9 ++++++---
 setup.py    | 2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c10464fc..190ba9c1 100644
--- a/.travis.yml
+++ b/.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
diff --git a/setup.cfg b/setup.cfg
index 76ce19b8..79925040 100644
--- a/setup.cfg
+++ b/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
diff --git a/setup.py b/setup.py
index cd5b03d2..2ed03c9f 100644
--- a/setup.py
+++ b/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']
 )

From 419deeb9ab1fa047c32bf93a7f1fcc19beb11947 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Thu, 19 Jul 2018 13:32:20 +0200
Subject: [PATCH 2/2] Fixing tox coverage

---
 .coveragerc | 1 -
 tox.ini     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 618733f4..4f06f27d 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -7,7 +7,6 @@ source =
 branch = true
 source =
     decaylanguage
-    tests
 parallel = true
 
 [report]
diff --git a/tox.ini b/tox.ini
index ae2848d6..f5bcdae1 100644
--- a/tox.ini
+++ b/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 =