Switched tests to Python 3.10 style annotations

8 files changed, 27 insertions, 18 deletions

diff --git a/tests/test_datastores.py b/tests/test_datastores.py
index e5b50a7..a73c5c2 100644
--- a/tests/test_datastores.py
+++ b/tests/test_datastores.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from contextlib import asynccontextmanager
 from datetime import datetime, timezone
 from tempfile import TemporaryDirectory
-from typing import AsyncGenerator, List, Optional, Set, Type
+from typing import AsyncGenerator, Optional
 
 import anyio
 import pytest
@@ -128,7 +128,7 @@ async def datastore(request):
 
 
 @pytest.fixture
-def schedules() -> List[Schedule]:
+def schedules() -> list[Schedule]:
     trigger = DateTrigger(datetime(2020, 9, 13, tzinfo=timezone.utc))
     schedule1 = Schedule(id='s1', task_id='task1', trigger=trigger)
     schedule1.next_fire_time = trigger.next()
@@ -145,15 +145,15 @@ def schedules() -> List[Schedule]:
 @asynccontextmanager
 async def capture_events(
     datastore: AsyncDataStore, limit: int,
-    event_types: Optional[Set[Type[Event]]] = None
-) -> AsyncGenerator[List[Event], None]:
+    event_types: Optional[set[type[Event]]] = None
+) -> AsyncGenerator[list[Event], None]:
     def listener(event: Event) -> None:
         events.append(event)
         if len(events) == limit:
             limit_event.set()
             subscription.unsubscribe()
 
-    events: List[Event] = []
+    events: list[Event] = []
     limit_event = anyio.Event()
     subscription = datastore.events.subscribe(listener, event_types)
     yield events
@@ -195,7 +195,7 @@ class TestAsyncStores:
         assert not events
 
     async def test_add_schedules(self, datastore: AsyncDataStore,
-                                 schedules: List[Schedule]) -> None:
+                                 schedules: list[Schedule]) -> None:
         async with datastore, capture_events(datastore, 3, {ScheduleAdded}) as events:
             for schedule in schedules:
                 await datastore.add_schedule(schedule, ConflictPolicy.exception)
@@ -211,7 +211,7 @@ class TestAsyncStores:
             assert event.next_fire_time == schedule.next_fire_time
 
     async def test_replace_schedules(self, datastore: AsyncDataStore,
-                                     schedules: List[Schedule]) -> None:
+                                     schedules: list[Schedule]) -> None:
         async with datastore, capture_events(datastore, 1, {ScheduleUpdated}) as events:
             for schedule in schedules:
                 await datastore.add_schedule(schedule, ConflictPolicy.exception)
@@ -238,7 +238,7 @@ class TestAsyncStores:
         assert not events
 
     async def test_remove_schedules(self, datastore: AsyncDataStore,
-                                    schedules: List[Schedule]) -> None:
+                                    schedules: list[Schedule]) -> None:
         async with datastore, capture_events(datastore, 2, {ScheduleRemoved}) as events:
             for schedule in schedules:
                 await datastore.add_schedule(schedule, ConflictPolicy.exception)
@@ -256,7 +256,7 @@ class TestAsyncStores:
 
     @pytest.mark.freeze_time(datetime(2020, 9, 14, tzinfo=timezone.utc))
     async def test_acquire_release_schedules(
-            self, datastore: AsyncDataStore, schedules: List[Schedule]) -> None:
+            self, datastore: AsyncDataStore, schedules: list[Schedule]) -> None:
         event_types = {ScheduleRemoved, ScheduleUpdated}
         async with datastore, capture_events(datastore, 2, event_types) as events:
             for schedule in schedules:
@@ -304,7 +304,7 @@ class TestAsyncStores:
         assert not events
 
     async def test_acquire_schedules_lock_timeout(
-            self, datastore: AsyncDataStore, schedules: List[Schedule], freezer) -> None:
+            self, datastore: AsyncDataStore, schedules: list[Schedule], freezer) -> None:
         """
         Test that a scheduler can acquire schedules that were acquired by another scheduler but
         not released within the lock timeout period.
diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py
index 63729bb..6a45b8b 100644
--- a/tests/test_schedulers.py
+++ b/tests/test_schedulers.py
@@ -1,6 +1,5 @@
 import threading
 from datetime import datetime, timezone
-from typing import List
 
 import anyio
 import pytest
@@ -30,7 +29,7 @@ class TestAsyncScheduler:
             if len(received_events) == 5:
                 event.set()
 
-        received_events: List[Event] = []
+        received_events: list[Event] = []
         event = anyio.Event()
         scheduler = AsyncScheduler(start_worker=False)
         scheduler.events.subscribe(listener)
@@ -81,7 +80,7 @@ class TestSyncScheduler:
             if len(received_events) == 5:
                 event.set()
 
-        received_events: List[Event] = []
+        received_events: list[Event] = []
         event = threading.Event()
         scheduler = Scheduler(start_worker=False)
         scheduler.events.subscribe(listener)
diff --git a/tests/test_workers.py b/tests/test_workers.py
index f8522f3..74a018c 100644
--- a/tests/test_workers.py
+++ b/tests/test_workers.py
@@ -1,6 +1,6 @@
 import threading
 from datetime import datetime, timezone
-from typing import Callable, List
+from typing import Callable
 
 import anyio
 import pytest
@@ -45,7 +45,7 @@ class TestAsyncWorker:
             if len(received_events) == 5:
                 event.set()
 
-        received_events: List[Event] = []
+        received_events: list[Event] = []
         event = anyio.Event()
         data_store = MemoryDataStore()
         worker = AsyncWorker(data_store)
@@ -104,7 +104,7 @@ class TestAsyncWorker:
                 event.set()
 
         scheduled_start_time = datetime(2020, 9, 14, tzinfo=timezone.utc)
-        received_events: List[Event] = []
+        received_events: list[Event] = []
         event = anyio.Event()
         data_store = MemoryDataStore()
         worker = AsyncWorker(data_store)
@@ -158,7 +158,7 @@ class TestSyncWorker:
             if len(received_events) == 5:
                 event.set()
 
-        received_events: List[Event] = []
+        received_events: list[Event] = []
         event = threading.Event()
         data_store = MemoryDataStore()
         worker = Worker(data_store)
@@ -216,7 +216,7 @@ class TestSyncWorker:
                 event.set()
 
         scheduled_start_time = datetime(2020, 9, 14, tzinfo=timezone.utc)
-        received_events: List[Event] = []
+        received_events: list[Event] = []
         event = threading.Event()
         data_store = MemoryDataStore()
         worker = Worker(data_store)
diff --git a/tests/triggers/test_calendarinterval.py b/tests/triggers/test_calendarinterval.py
index 4074ff8..dd45212 100644
--- a/tests/triggers/test_calendarinterval.py
+++ b/tests/triggers/test_calendarinterval.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import date, datetime
 
 import pytest
diff --git a/tests/triggers/test_combining.py b/tests/triggers/test_combining.py
index 890175d..fbdbfd0 100644
--- a/tests/triggers/test_combining.py
+++ b/tests/triggers/test_combining.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
 
 import pytest
diff --git a/tests/triggers/test_cron.py b/tests/triggers/test_cron.py
index d21b916..578dd7d 100644
--- a/tests/triggers/test_cron.py
+++ b/tests/triggers/test_cron.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from datetime import datetime
 
diff --git a/tests/triggers/test_date.py b/tests/triggers/test_date.py
index 6147c1c..41116b0 100644
--- a/tests/triggers/test_date.py
+++ b/tests/triggers/test_date.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import datetime
 
 from apscheduler.triggers.date import DateTrigger
diff --git a/tests/triggers/test_interval.py b/tests/triggers/test_interval.py
index 6d788f4..1778f61 100644
--- a/tests/triggers/test_interval.py
+++ b/tests/triggers/test_interval.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
 
 import pytest