Bump mypy from 1.10.1 to 1.11.1 (#1963)

ThePalaceProject · Aug 26, 2024 · 0f093bc · 0f093bc
1 parent 40aa041
commit 0f093bc
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 35 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/src/palace/manager/feed/annotator/circulation.py b/src/palace/manager/feed/annotator/circulation.py
@@ -223,7 +223,7 @@ def is_work_entry_solo(self, work: Work) -> bool:
         :rtype: bool
         """
         return any(
-            work in x  # type: ignore[operator] # Mypy gets confused with complex "in" statements
+            work in x
             for x in (
                 self.active_loans_by_work,
                 self.active_holds_by_work,

diff --git a/tests/manager/api/odl/test_auth.py b/tests/manager/api/odl/test_auth.py
@@ -220,7 +220,7 @@ def test__unknown_auth_type(
         self, authenticated_get_fixture: AuthenticatedGetFixture
     ) -> None:
         authenticated_get = authenticated_get_fixture.authenticated_get(
-            auth_type="invalid"
+            auth_type="invalid"  # type: ignore[arg-type]
         )
         with pytest.raises(PalaceValueError) as exc_info:
             authenticated_get._get(

diff --git a/tests/manager/api/saml/conftest.py b/tests/manager/api/saml/conftest.py
@@ -9,14 +9,14 @@
 
 from palace.manager.api.saml.configuration.model import (
     SAMLOneLoginConfiguration,
+    SAMLWebSSOAuthLibrarySettings,
     SAMLWebSSOAuthSettings,
 )
 from palace.manager.api.saml.metadata.model import (
     SAMLIdentityProviderMetadata,
     SAMLServiceProviderMetadata,
 )
 from palace.manager.api.saml.provider import SAMLWebSSOAuthenticationProvider
-from palace.manager.integration.settings import BaseSettings
 from tests.mocks.saml_strings import CORRECT_XML_WITH_ONE_SP
 
 if TYPE_CHECKING:
@@ -43,12 +43,13 @@ def create_saml_provider(
     create_saml_configuration: Callable[..., SAMLWebSSOAuthSettings],
 ) -> Callable[..., SAMLWebSSOAuthenticationProvider]:
     library = controller_fixture.db.default_library()
+    assert library.id is not None
     return partial(
         SAMLWebSSOAuthenticationProvider,
         library_id=library.id,
         integration_id=mock_integration_id,
         settings=create_saml_configuration(),
-        library_settings=BaseSettings(),
+        library_settings=SAMLWebSSOAuthLibrarySettings(),
     )
 
 

diff --git a/tests/manager/api/test_authenticator.py b/tests/manager/api/test_authenticator.py
@@ -151,9 +151,11 @@ def mock_integration_id() -> int:
 def mock_basic(
     db: DatabaseTransactionFixture, mock_integration_id: int
 ) -> MockBasicFixture:
+    library_id = db.default_library().id
+    assert library_id is not None
     return partial(
         MockBasic,
-        library_id=db.default_library().id,
+        library_id=library_id,
         integration_id=mock_integration_id,
     )
 

diff --git a/tests/manager/api/test_sirsidynix_auth_provider.py b/tests/manager/api/test_sirsidynix_auth_provider.py
@@ -388,6 +388,7 @@ def test_full_auth_request(
             library_identifier_restriction_type=restriction_type,
             library_identifier_restriction_criteria=restriction,
         )
+        assert library.id is not None
         provider = sirsi_auth_fixture.provider(
             library_id=library.id,
             library_settings=library_settings,

diff --git a/tests/migration/conftest.py b/tests/migration/conftest.py
@@ -208,7 +208,7 @@ def fixture(
         library_id: int | None = None,
         associate_library: bool = False,
     ) -> int:
-        if type(value) in (tuple, list, dict):
+        if type(value) in (tuple, list, dict):  # type: ignore[comparison-overlap]
             value = json.dumps(value)
         setting = connection.execute(
             "INSERT INTO configurationsettings (key, value, external_integration_id, library_id) VALUES (%s, %s, %s, %s) returning id",