Address notes

Author: chadrik

src/rez/package_order.py

@@ -678,6 +678,10 @@ def refresh(self) -> None:
                 self.by_package[package] = orderer
 
     if not TYPE_CHECKING:
+        # Since this class inherits from list it's easier to rely on the type hints coming from
+        # that base class than to redefine them here, so we hide them by placing them behind
+        # not TYPE_CHECKING.
+
         def append(self, *args, **kwargs):
             self.dirty = True
             return super().append(*args, **kwargs)

src/rez/solver.py

@@ -29,7 +29,7 @@
 from contextlib import contextmanager
 from enum import Enum
 from itertools import product, chain
-from typing import Any, Callable, Generator, Iterator, TypeVar, TYPE_CHECKING
+from typing import cast, Any, Callable, Generator, Iterator, TypeVar, TYPE_CHECKING
 import copy
 import time
 import sys
@@ -931,8 +931,7 @@ def __str__(self) -> str:
             s = "[%s==%s%s]" % (self.package_name, str(variant.version), s_idx)
         elif nversions == 1:
             entry = self.entries[0]
-            # we expect all variants to have a non-None index, but filter to satisfy mypy
-            indexes = sorted([x.index for x in entry.variants if x.index is not None])
+            indexes = cast("list[int]", sorted([x.index for x in entry.variants]))
             s_idx = ','.join(str(x) for x in indexes)
             verstr = str(entry.version)
             s = "[%s==%s[%s]]" % (self.package_name, verstr, s_idx)

src/rez/version/_requirement.py

@@ -252,7 +252,7 @@ def safe_str(self) -> str:
         """
         return str(self)
 
-    def conflicts_with(self, other: object) -> bool:
+    def conflicts_with(self, other: Requirement | VersionedObject) -> bool:
         """Returns True if this requirement conflicts with another :class:`Requirement`
         or :class:`VersionedObject`.
 
@@ -278,7 +278,7 @@ def conflicts_with(self, other: object) -> bool:
             else:
                 return (other.version_ not in self.range_)
         else:
-            return NotImplemented
+            raise TypeError
 
     def merged(self, other: Requirement) -> Requirement | None:
         """Merge two requirements.