Skip to content

Commit

Permalink
Revert "pytest: moved conftest.py to project root"
Browse files Browse the repository at this point in the history
This reverts commit 90d13d0.

# Conflicts:
#	guidata/tests/conftest.py
  • Loading branch information
PierreRaybaut committed Jun 21, 2024
1 parent 705cd4f commit 5b00608
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/run_pytest.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5b00608

Please sign in to comment.