From 046648ce6cda757308bf10351d542a0598aea3ac Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 12 Mar 2018 23:06:32 +0100
Subject: [PATCH] Moved pytest.ini to setup.cfg

---
 api/pytest.ini | 6 ------
 api/setup.cfg  | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 api/pytest.ini

diff --git a/api/pytest.ini b/api/pytest.ini
deleted file mode 100644
index 9be63d353..000000000
--- a/api/pytest.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[pytest]
-DJANGO_SETTINGS_MODULE=config.settings.test
-
-# -- recommended but optional:
-python_files = tests.py test_*.py *_tests.py
-testpatsh = tests
diff --git a/api/setup.cfg b/api/setup.cfg
index c18b80d95..954b4d196 100644
--- a/api/setup.cfg
+++ b/api/setup.cfg
@@ -5,3 +5,8 @@ exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
 [pep8]
 max-line-length = 120
 exclude=.tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
+
+[pytest]
+DJANGO_SETTINGS_MODULE=config.settings.test
+python_files = tests.py test_*.py *_tests.py
+testpaths = tests
-- 
GitLab