From 5b00608781f725460a7a86822e8ed0d0c7ed2dfc Mon Sep 17 00:00:00 2001
From: Pierre Raybaut <p.raybaut@codra.fr>
Date: Fri, 21 Jun 2024 11:11:34 +0200
Subject: [PATCH] Revert "pytest: moved conftest.py to project root"

This reverts commit 90d13d0a1620661fd7a46e158e78575f03caf3be.

# Conflicts:
#	guidata/tests/conftest.py
---
 .github/workflows/python-package.yml     | 2 +-
 conftest.py => guidata/tests/conftest.py | 0
 scripts/run_pytest.bat                   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename conftest.py => guidata/tests/conftest.py (100%)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index db2ac3b..194710e 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -45,4 +45,4 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        pytest
+        pytest guidata
diff --git a/conftest.py b/guidata/tests/conftest.py
similarity index 100%
rename from conftest.py
rename to guidata/tests/conftest.py
diff --git a/scripts/run_pytest.bat b/scripts/run_pytest.bat
index d49d462..f7794d7 100644
--- a/scripts/run_pytest.bat
+++ b/scripts/run_pytest.bat
@@ -19,7 +19,7 @@ for /D %%d in ("%DIR0%*") do (
     set WINPYDIRBASE=%%d
     call !WINPYDIRBASE!\scripts\env.bat
     echo Running pytest from "%%d":
-    pytest --ff -q
+    pytest --ff -q %MODNAME%
     echo ----
 )
 call %FUNC% EndOfScript