fix tests for < 3.10

django_routines/__init__.py

@@ -58,6 +58,14 @@ class RoutineCommand:
     """
 
 
+# todo - remove this and replace with key argument when support for python <3.10 dropped.
+def insort_right_with_key(a, x, key=lambda x: x):
+    transformed_list = [key(item) for item in a]
+    transformed_x = key(x)
+    insert_point = bisect.bisect_right(transformed_list, transformed_x)
+    a.insert(insert_point, x)
+
+
 @dataclass
 class Routine:
     """
@@ -101,7 +109,9 @@ def plan(self, switches: Set[str]) -> List[RoutineCommand]:
         ]
 
     def command(self, command: RoutineCommand):
-        bisect.insort(self.commands, command, key=lambda cmd: cmd.priority)
+        # python >= 3.10
+        # bisect.insort(self.commands, command, key=lambda cmd: cmd.priority)
+        insort_right_with_key(self.commands, command, key=lambda cmd: cmd.priority)
         return command
 
 

django_routines/management/commands/routines.py → django_routines/management/commands/routine.py

@@ -49,7 +49,7 @@ class Command(TyperCommand, rich_markup_mode="rich"):  # type: ignore
     verbosity: int = 1
     switches: t.Set[str] = set()
 
-    suppressed_base_arguments: t.Optional[t.Iterable[str]] = None
+    suppressed_base_arguments = set()
 
     _routine: t.Optional[Routine] = None
     _verbosity_passed: bool = False

pyproject.toml

@@ -70,6 +70,7 @@ pexpect = "^4.9.0"
 pyright = "^1.1.357"
 ruff = "^0.4.1"
 django-stubs = "^5.0.2"
+mypy = "^1.10.0"
 
 [tool.poetry.extras]
 rich = ["rich"]

tests/tests.py

@@ -27,7 +27,7 @@ def test_command(self, no_color=True, verbosity=None):
         passed_options.clear()
 
         command = (
-            "routines",
+            "routine",
             ("--no-color" if no_color else "--force-color"),
             *(("--verbosity", str(verbosity)) if verbosity is not None else tuple()),
             "test",
@@ -126,9 +126,9 @@ def test_verbosity(self):
 
     def test_list(self, no_color=True):
         if no_color:
-            command = ("routines", "--no-color", "test")
+            command = ("routine", "--no-color", "test")
         else:
-            command = ("routines", "--force-color", "test")
+            command = ("routine", "--force-color", "test")
 
         out = StringIO()
         call_command(*command, "--all", "list", stdout=out)