@@ -16,6 +16,8 @@ VENV_PIPELEX := $(VIRTUAL_ENV)/bin/pipelex
1616
1717UV_MIN_VERSION = $(shell grep -m1 'required-version' pyproject.toml | sed -E 's/.* = * "([^<>=, ]+) .*/\1/')
1818
19+ USUAL_PYTEST_MARKERS := "(dry_runnable or not (inference or llm or imgg or ocr)) and not (needs_output or pipelex_api)"
20+
1921define PRINT_TITLE
2022 $(eval PROJECT_PART := [$(PROJECT_NAME ) ])
2123 $(eval TARGET_PART := ($@ ) )
@@ -203,17 +205,17 @@ cleanall: cleanderived cleanenv cleanlibraries
203205codex-tests : env
204206 $(call PRINT_TITLE,"Unit testing for Codex")
205207 @echo " • Running unit tests for Codex (excluding inference and codex_disabled)"
206- $(VENV_PYTEST ) -- exitfirst --quiet -m " not ( inference or codex_disabled or pipelex_api)" || [ $$ ? = 5 ]
208+ $(VENV_PYTEST ) -n auto -- exitfirst --quiet -m " (dry_runnable or not inference) and not (needs_output or pipelex_api)" || [ $$ ? = 5 ]
207209
208210gha-tests : env
209211 $(call PRINT_TITLE,"Unit testing for github actions")
210212 @echo " • Running unit tests for github actions (excluding inference and gha_disabled)"
211- $(VENV_PYTEST ) -- exitfirst --quiet -m " not ( inference or gha_disabled or pipelex_api)" || [ $$ ? = 5 ]
213+ $(VENV_PYTEST ) -n auto -- exitfirst --quiet -m " (dry_runnable or not inference) and not ( gha_disabled or pipelex_api)" || [ $$ ? = 5 ]
212214
213215run-all-tests : env
214216 $(call PRINT_TITLE,"Running all unit tests")
215217 @echo " • Running all unit tests"
216- $(VENV_PYTEST ) --exitfirst --quiet
218+ $(VENV_PYTEST ) -n auto - -exitfirst --quiet
217219
218220run-manual-trigger-gha-tests : env
219221 $(call PRINT_TITLE,"Running GHA tests")
@@ -229,18 +231,18 @@ test: env
229231 $(call PRINT_TITLE,"Unit testing without prints but displaying logs via pytest for WARNING level and above")
230232 @echo " • Running unit tests"
231233 @if [ -n " $( TEST) " ]; then \
232- $(VENV_PYTEST ) -s -o log_cli=true -o log_level=WARNING -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
234+ $(VENV_PYTEST ) -s -m $( USUAL_PYTEST_MARKERS ) - o log_cli=true -o log_level=WARNING -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
233235 else \
234- $(VENV_PYTEST ) -s -o log_cli=true -o log_level=WARNING $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
236+ $(VENV_PYTEST ) -s -m $( USUAL_PYTEST_MARKERS ) - o log_cli=true -o log_level=WARNING $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
235237 fi
236238
237239test-xdist : env
238240 $(call PRINT_TITLE,"Unit testing without prints but displaying logs via pytest for WARNING level and above")
239241 @echo " • Running unit tests"
240242 @if [ -n " $( TEST) " ]; then \
241- $(VENV_PYTEST ) -n auto -o log_level=WARNING -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
243+ $(VENV_PYTEST ) -n auto -m $( USUAL_PYTEST_MARKERS ) - o log_level=WARNING -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
242244 else \
243- $(VENV_PYTEST ) -n auto -o log_level=WARNING $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
245+ $(VENV_PYTEST ) -n auto -m $( USUAL_PYTEST_MARKERS ) - o log_level=WARNING $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
244246 fi
245247
246248t : test-xdist
@@ -250,9 +252,9 @@ test-quiet: env
250252 $(call PRINT_TITLE,"Unit testing without prints but displaying logs via pytest for WARNING level and above")
251253 @echo " • Running unit tests"
252254 @if [ -n " $( TEST) " ]; then \
253- $(VENV_PYTEST ) -o log_cli=true -o log_level=WARNING -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
255+ $(VENV_PYTEST ) -m $( USUAL_PYTEST_MARKERS ) - o log_cli=true -o log_level=WARNING -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
254256 else \
255- $(VENV_PYTEST ) -o log_cli=true -o log_level=WARNING $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
257+ $(VENV_PYTEST ) -m $( USUAL_PYTEST_MARKERS ) - o log_cli=true -o log_level=WARNING $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
256258 fi
257259
258260tq : test-quiet
@@ -262,9 +264,9 @@ test-with-prints: env
262264 $(call PRINT_TITLE,"Unit testing with prints and our rich logs")
263265 @echo " • Running unit tests"
264266 @if [ -n " $( TEST) " ]; then \
265- $(VENV_PYTEST ) -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
267+ $(VENV_PYTEST ) -s -m $( USUAL_PYTEST_MARKERS ) - k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
266268 else \
267- $(VENV_PYTEST ) -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
269+ $(VENV_PYTEST ) -s -m $( USUAL_PYTEST_MARKERS ) $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
268270 fi
269271
270272tp : test-with-prints
@@ -273,9 +275,9 @@ tp: test-with-prints
273275test-inference : env
274276 $(call PRINT_TITLE,"Unit testing")
275277 @if [ -n " $( TEST) " ]; then \
276- $(VENV_PYTEST ) --exitfirst -m " inference and not imgg" -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
278+ $(VENV_PYTEST ) --pipe-run-mode live -- exitfirst -m " inference and not imgg" -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
277279 else \
278- $(VENV_PYTEST ) --exitfirst -m " inference and not imgg" -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
280+ $(VENV_PYTEST ) --pipe-run-mode live -- exitfirst -m " inference and not imgg" -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
279281 fi
280282
281283ti : test-inference
@@ -284,9 +286,9 @@ ti: test-inference
284286test-ocr : env
285287 $(call PRINT_TITLE,"Unit testing ocr")
286288 @if [ -n " $( TEST) " ]; then \
287- $(VENV_PYTEST ) --exitfirst -m " ocr" -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
289+ $(VENV_PYTEST ) --pipe-run-mode live -- exitfirst -m " ocr" -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
288290 else \
289- $(VENV_PYTEST ) --exitfirst -m " ocr" -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
291+ $(VENV_PYTEST ) --pipe-run-mode live -- exitfirst -m " ocr" -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
290292 fi
291293
292294to : test-ocr
@@ -295,9 +297,9 @@ to: test-ocr
295297test-imgg : env
296298 $(call PRINT_TITLE,"Unit testing")
297299 @if [ -n " $( TEST) " ]; then \
298- $(VENV_PYTEST ) --exitfirst -m " imgg" -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
300+ $(VENV_PYTEST ) --pipe-run-mode live -- exitfirst -m " imgg" -s -k " $( TEST) " $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
299301 else \
300- $(VENV_PYTEST ) --exitfirst -m " imgg" -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
302+ $(VENV_PYTEST ) --pipe-run-mode live -- exitfirst -m " imgg" -s $(if $(filter 1,$(VERBOSE ) ) ,-v,$(if $(filter 2,$(VERBOSE ) ) ,-vv,$(if $(filter 3,$(VERBOSE ) ) ,-vvv,) ) ) ; \
301303 fi
302304
303305tg : test-imgg
0 commit comments