Merge branch 'main' into task/better-dx

cds-snc · Jan 30, 2025 · f7a62aa · f7a62aa
2 parents b719c61 + ac3503a
commit f7a62aa
Show file tree

Hide file tree

Showing 8 changed files with 1,313 additions and 338 deletions.
diff --git a/.devcontainer/scripts/installations.sh b/.devcontainer/scripts/installations.sh
@@ -38,9 +38,6 @@ poetry completions zsh > ~/.zfunc/_poetry
 cd /workspace
 poetry install
 
-# Install pre-commit hooks
-poetry run pre-commit install
-
 # Poe the Poet plugin tab completions
 touch ~/.zfunc/_poe
 poetry run poe _zsh_completion > ~/.zfunc/_poe
@@ -54,3 +51,6 @@ npm run build
 
 # install npm deps (i.e. cypress)
 cd tests_cypress && npm install && npx cypress install && cd ..
+
+# Install pre-commit hooks
+poetry run pre-commit install
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ generate-version-file: ## Generates the app version file
 
 .PHONY: test
 test:
-	./scripts/run_tests.sh
+	poetry run ./scripts/run_tests.sh
 
 .PHONY: babel-test
 test-translations: babel
@@ -62,10 +62,10 @@ run-gunicorn:
 
 .PHONY: format
 format:
-	ruff check --fix .
-	ruff check
-	ruff format .
-	mypy ./
+	poetry run ruff check --fix .
+	poetry run ruff check
+	poetry run ruff format .
+	poetry run mypy ./
 	npx prettier --write app/assets/javascripts app/assets/stylesheets tests_cypress/cypress/e2e
 
 .PHONY: tailwind