Resolve CI failures

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index adee44a77e182e2dc9bfadb4d87b07e5e006fc5c..420080284578b1689e688c6f3c37ed6c6af49909 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -689,7 +689,7 @@ class MappedColumn(
             supercls_mapper = class_mapper(decl_scan.inherits, False)
 
             colname = column.name if column.name is not None else key
-            column = self.column = supercls_mapper.local_table.c.get(  # type: ignore # noqa: E501
+            column = self.column = supercls_mapper.local_table.c.get(  # noqa: E501
                 colname, column
             )
 

diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index 2f0fcc55295c5a252fcf9ee5419f147e30fc20a4..bf24540689eaf8a88c7a2c014480f7995f1f925a 100644 (file)
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -1642,7 +1642,7 @@ class ColumnCollection(Generic[_COLKEY, _COL_co]):
         return self.compare(other)
 
     @overload
-    def get(self, key: str, default: _COL_co) -> _COL_co: ...
+    def get(self, key: str, default: _COL) -> _COL: ...
 
     @overload
     def get(