run pylint AND ruff

Author: Kakadus

.github/workflows/tests.yml

@@ -88,8 +88,10 @@ jobs:
       - name: Setup python
         uses: ./.github/setup_python
 
-      - name: Run linter
-        run: ruff evap
+      - name: Run linters
+        run: |
+          pylint evap -j0
+          ruff evap
 
 
   formatter:

evap/evaluation/management/commands/lint.py

@@ -9,4 +9,5 @@ class Command(BaseCommand):
     requires_migrations_checks = False
 
     def handle(self, *args, **options):
-        subprocess.run(["ruff", "evap/"], check=False)  # nosec
+        subprocess.run(["pylint", "evap"], check=False)  # nosec
+        subprocess.run(["ruff", "evap"], check=False)  # nosec

evap/evaluation/tests/test_commands.py

@@ -4,7 +4,7 @@
 from datetime import date, datetime, timedelta
 from io import StringIO
 from itertools import chain, cycle
-from unittest.mock import call, patch
+from unittest.mock import MagicMock, call, patch
 
 from django.conf import settings
 from django.core import mail, management
@@ -366,11 +366,12 @@ def test_send_text_answer_review_reminder(self):
 
 
 class TestLintCommand(TestCase):
-    @staticmethod
     @patch("subprocess.run")
-    def test_pylint_called(mock_subprocess_run):
+    def test_pylint_called(self, mock_subprocess_run: MagicMock):
         management.call_command("lint")
-        mock_subprocess_run.assert_called_once_with(["pylint", "evap"], check=False)
+        self.assertListEqual(
+            mock_subprocess_run.mock_calls, [call(["pylint", "evap"], check=False), call(["ruff", "evap"], check=False)]
+        )
 
 
 class TestFormatCommand(TestCase):