From a928fbfafe3a5f751d9bab75b916345758f635c0 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Tue, 30 Oct 2018 10:12:17 +0100
Subject: [PATCH] Config files (#1057)

* Move coveragerc to setup.cfg

* Move pytest.ini to setup.cfg

Closes #1027
---
 src/.coveragerc | 12 ------------
 src/pytest.ini  |  3 ---
 src/setup.cfg   | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 src/.coveragerc
 delete mode 100644 src/pytest.ini

diff --git a/src/.coveragerc b/src/.coveragerc
deleted file mode 100644
index 5d4d12218..000000000
--- a/src/.coveragerc
+++ /dev/null
@@ -1,12 +0,0 @@
-[run]
-source = pretix
-omit = */migrations/*,*/urls.py,*/tests/*,*/testdummy/*,*/admin.py,pretix/wsgi.py,pretix/settings.py
-
-[report]
-exclude_lines =
-	pragma: no cover
-	def __str__
-	der __repr__
-	if settings.DEBUG
-	NOQA
-	NotImplementedError
diff --git a/src/pytest.ini b/src/pytest.ini
deleted file mode 100644
index d88b2f1c8..000000000
--- a/src/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-DJANGO_SETTINGS_MODULE=tests.settings
-addopts =--reruns 3 -rw
diff --git a/src/setup.cfg b/src/setup.cfg
index 065a65eb4..6f32b74c6 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -15,6 +15,23 @@ multi_line_output = 5
 not_skip = __init__.py
 skip = make_testdata.py,wsgi.py,bootstrap,celery_app.py,settings.py
 
+[tool:pytest]
+DJANGO_SETTINGS_MODULE=tests.settings
+addopts =--reruns 3 -rw
+
+[coverage:run]
+source = pretix
+omit = */migrations/*,*/urls.py,*/tests/*,*/testdummy/*,*/admin.py,pretix/wsgi.py,pretix/settings.py
+
+[coverage:report]
+exclude_lines =
+	pragma: no cover
+	def __str__
+	der __repr__
+	if settings.DEBUG
+	NOQA
+	NotImplementedError
+
 [potypo]
 default_language = en_US
 locales_dir = pretix/locale