From 4b494385eceba3915da44077264f53d362b3ad4a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 8 May 2018 14:08:57 +0200
Subject: [PATCH] Move pytest config to setup.cfg

Also adds `testspath` to improve test collection performance.
---
 setup.cfg | 4 ++++
 tox.ini   | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a665f95ce..e2cb2a812 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,10 @@ universal = 1
 [metadata]
 license_file = LICENSE.md
 
+[pytest]
+addopts=--tb=short --strict
+testspath = tests
+
 [flake8]
 ignore = E501
 banned-modules = json = use from rest_framework.utils import json!
diff --git a/tox.ini b/tox.ini
index 9efeea5e5..4ea8ff7be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,3 @@
-[pytest]
-addopts=--tb=short --strict
-
 [tox]
 envlist =
        {py27,py34,py35}-django110,