From 50f6ff41788c9fbb6126c908810931e01ec2d49a Mon Sep 17 00:00:00 2001
From: Pierre Raybaut <pierre.raybaut@gmail.com>
Date: Fri, 21 Jun 2024 11:13:58 +0200
Subject: [PATCH] Revert "pytest: moved conftest.py to project root"

This reverts commit f4fafa2646998dc7eb7f60d2a0c8053d5028517d.

# Conflicts:
#	.vscode/settings.json
#	scripts/run_coverage.bat
---
 conftest.py => qwt/tests/conftest.py | 0
 scripts/run_pytest.bat               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename conftest.py => qwt/tests/conftest.py (100%)

diff --git a/conftest.py b/qwt/tests/conftest.py
similarity index 100%
rename from conftest.py
rename to qwt/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