Revert "pytest: moved conftest.py to project root"

This reverts commit d3589f3. # Conflicts: # cdl/tests/conftest.py
DataLab-Platform · Jun 21, 2024 · bb04b9c · bb04b9c
1 parent 7466f64
commit bb04b9c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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 cdl
diff --git a/conftest.py → cdl/tests/conftest.py b/conftest.py → cdl/tests/conftest.py
diff --git a/scripts/run_pytest.bat b/scripts/run_pytest.bat
@@ -12,5 +12,5 @@ call %~dp0utils GetScriptPath SCRIPTPATH
 call %FUNC% GetModName MODNAME
 call %FUNC% SetPythonPath
 call %FUNC% UsePython
-pytest --ff %*
+pytest --ff %MODNAME% %*
 call %FUNC% EndOfScript
diff --git a/scripts/run_pytest_on_all.bat b/scripts/run_pytest_on_all.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