From efa1aeda1004a1a1a46d837813fd30aa53a308c5 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 16 Sep 2018 12:49:10 +0200
Subject: [PATCH] tests: cleanup pytest config

---
 setup.cfg | 29 ++++-------------------------
 tox.ini   |  2 +-
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 694845f4..49847340 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,34 +5,13 @@ universal = 1
 max-line-length = 140
 exclude = tests/*,*/migrations/*,*/south_migrations/*
 
-[pytest]
-# using the deprecated name instead of [tool:pytest] cause we test with older pytest versions
-norecursedirs =
-    .git
-    .tox
-    .env
-    venv
-    dist
-    build
-    south_migrations
-    migrations
-    example
-python_files =
-    test_*.py
-    *_test.py
-    tests.py
+[tool:pytest]
+testpaths = tests
+python_files = test_*.py
 addopts =
-    -rxEfsw
+    -ra
     --strict
-    --ignore=docs/conf.py
-    --ignore=setup.py
-    --ignore=src
-    --ignore=ci
-    --ignore=.eggs
-    --doctest-modules
-    --doctest-glob=\*.rst
     --tb=short
-    -p pytester
 
 [isort]
 force_single_line=True
diff --git a/tox.ini b/tox.ini
index 1d88b75d..3c55d742 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ deps =
 pip_pre = true
 
 commands =
-    {posargs:py.test -vv}
+    pytest {posargs:-vv}
 
 [testenv:spell]
 setenv =