Fix linting config

.github/workflows/linting_and_tests.yml

@@ -4,11 +4,13 @@ name: CI Checks
 
 on:
   pull_request:
-    branches: main
+    branches:
+      - main
+      - azure
 
 jobs:
   linting-and-tests:
     name: Linting and tests
     uses: amsterdam/github-workflows/.github/workflows/CI.yml@v1
     with:
-      check_linting: false  # Requires Makefile target "lint"
+      check_linting: true  # Requires Makefile target "lint"

Dockerfile

@@ -54,7 +54,10 @@ CMD ["./manage.py", "runserver", "0.0.0.0"]
 FROM dev as tests
 
 USER datapunt
+WORKDIR /src
+COPY pyproject.toml /.
 
 ENV COVERAGE_FILE=/tmp/.coverage
+ENV PYTHONPATH=/src
 
 CMD ["pytest"]

Makefile

@@ -53,17 +53,15 @@ bash:                               ## Run the container and start bash
 test:                               ## Execute tests
 	$(run) test pytest $(ARGS)
 
-# TODO: Add lint and fixlint commands to replace linting in test
-
-lint:                               ## Execute lint checks
-	$(run) test autoflake . --check --recursive --quiet
-	$(run) test isort --diff --check /src/$(APP)
-
 lintfix:                            ## Execute lint fixes
 	$(run) test black /src/$(APP)
 	$(run) test autoflake /src --recursive --in-place --remove-unused-variables --remove-all-unused-imports --quiet
 	$(run) test isort /src/$(APP)
-
+
+lint:                               ## Execute lint checks
+	$(run) test autoflake /src --check --recursive --quiet
+	$(run) test isort --diff --check /src/$(APP)
+
 clean:                              ## Clean docker stuff
 	$(dc) down -v