diff --git a/evaluators/contrib/cisco/Makefile b/evaluators/contrib/cisco/Makefile index 136f622b..0f64617a 100644 --- a/evaluators/contrib/cisco/Makefile +++ b/evaluators/contrib/cisco/Makefile @@ -1,4 +1,6 @@ -.PHONY: help test lint lint-fix typecheck build +.PHONY: help test lint lint-fix typecheck check build + +PACKAGE := agent-control-evaluator-cisco help: @echo "Agent Control Evaluator - Cisco AI Defense - Makefile commands" @@ -6,20 +8,22 @@ help: @echo " make lint - run ruff check" @echo " make lint-fix - run ruff check --fix" @echo " make typecheck - run mypy" + @echo " make check - run test, lint, and typecheck" @echo " make build - build package" test: - uv run --with pytest --with pytest-asyncio --with pytest-cov pytest tests --cov=src --cov-report=xml:../../../coverage-evaluators-cisco.xml -q + uv run --with pytest --with pytest-asyncio --with pytest-cov --package $(PACKAGE) pytest tests --cov=src --cov-report=xml:../../../coverage-evaluators-cisco.xml -q lint: - uv run --with ruff ruff check --config ../../../pyproject.toml src/ + uv run --with ruff --package $(PACKAGE) ruff check --config ../../../pyproject.toml src/ lint-fix: - uv run --with ruff ruff check --config ../../../pyproject.toml --fix src/ + uv run --with ruff --package $(PACKAGE) ruff check --config ../../../pyproject.toml --fix src/ typecheck: - uv run --with mypy mypy --config-file ../../../pyproject.toml src/ + uv run --with mypy --package $(PACKAGE) mypy --config-file ../../../pyproject.toml src/ + +check: test lint typecheck build: uv build - diff --git a/evaluators/contrib/galileo/Makefile b/evaluators/contrib/galileo/Makefile index 0deea340..89d61ac0 100644 --- a/evaluators/contrib/galileo/Makefile +++ b/evaluators/contrib/galileo/Makefile @@ -1,4 +1,4 @@ -.PHONY: help sync test lint lint-fix typecheck build publish +.PHONY: help sync test lint lint-fix typecheck check build publish PACKAGE := agent-control-evaluator-galileo @@ -9,22 +9,25 @@ help: @echo " make lint - run ruff check" @echo " make lint-fix - run ruff check --fix" @echo " make typecheck - run mypy" + @echo " make check - run test, lint, and typecheck" @echo " make build - build package" sync: uv sync test: - uv run pytest --cov=src --cov-report=xml:../../../coverage-evaluators-galileo.xml -q + uv run --with pytest --with pytest-asyncio --with pytest-cov --package $(PACKAGE) pytest tests --cov=src --cov-report=xml:../../../coverage-evaluators-galileo.xml -q lint: - uv run ruff check --config ../../../pyproject.toml src/ + uv run --with ruff --package $(PACKAGE) ruff check --config ../../../pyproject.toml src/ lint-fix: - uv run ruff check --config ../../../pyproject.toml --fix src/ + uv run --with ruff --package $(PACKAGE) ruff check --config ../../../pyproject.toml --fix src/ typecheck: - uv run mypy --config-file ../../../pyproject.toml src/ + uv run --with mypy --package $(PACKAGE) mypy --config-file ../../../pyproject.toml src/ + +check: test lint typecheck build: uv build