Fixes some incorrect annotations

Author: Daverball

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude: '^(.bumpversion.cfg)$'
@@ -19,14 +19,14 @@ repos:
       - id: nocheckin
         exclude: .pre-commit-config.yaml
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear
         files: '^(src/.*|tests/.*)\.py$'
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.5
+    rev: 1.7.6
     hooks:
       - id: bandit
         args: ["-c", "pyproject.toml", "--quiet"]

HISTORY.rst

@@ -1,6 +1,9 @@
 Changelog
 ---------
 
+- Fixes some incorrect type annotations in `Scheduler`.
+  [Daverball]
+
 0.7.0 (2023-07-11)
 ~~~~~~~~~~~~~~~~~~~
 

src/libres/db/scheduler.py

@@ -204,7 +204,7 @@ def allocation_by_id(self, id: int) -> Allocation:
 
     def allocations_by_ids(
         self,
-        ids: _t.Collection[UUID]
+        ids: _t.Collection[int]
     ) -> 'Query[Allocation]':
         query = self.managed_allocations()
         query = query.filter(Allocation.id.in_(ids))
@@ -308,7 +308,7 @@ def allocation_mirrors_by_master(
 
     def allocation_dates_by_ids(
         self,
-        ids: _t.Collection[UUID],
+        ids: _t.Collection[int],
         start_time: _t.Optional[time] = None,
         end_time: _t.Optional[time] = None
     ) -> _t.Iterator[_t.Tuple[datetime, datetime]]:
@@ -322,7 +322,7 @@ def allocation_dates_by_ids(
 
             yield s_dt, e_dt - timedelta(microseconds=1)
 
-    def manual_approval_required(self, ids: _t.Collection[UUID]) -> bool:
+    def manual_approval_required(self, ids: _t.Collection[int]) -> bool:
         """ Returns True if any of the allocations require manual approval. """
         query = self.allocations_by_ids(ids)
         query = query.filter(Allocation.approve_manually == True)
@@ -803,8 +803,10 @@ def move_allocation(
                             change.reserved_slots[0]
                         )
 
-                    if change.is_master and \
-                            change.pending_reservations.count():
+                    if (
+                        change.is_master and
+                        change.pending_reservations.count()
+                    ):
                         raise errors.AffectedPendingReservationError(
                             change.pending_reservations[0]
                         )