Fixed: Linting

`make lint` now passes

Author: ForeverAngry

pyiceberg/table/__init__.py

@@ -115,12 +115,7 @@
     update_table_metadata,
 )
 from pyiceberg.table.update.schema import UpdateSchema
-from pyiceberg.table.update.snapshot import (
-    ManageSnapshots,
-    UpdateSnapshot,
-    _FastAppendFiles,
-    ExpireSnapshots
-)
+from pyiceberg.table.update.snapshot import ExpireSnapshots, ManageSnapshots, UpdateSnapshot, _FastAppendFiles
 from pyiceberg.table.update.spec import UpdateSpec
 from pyiceberg.table.update.statistics import UpdateStatistics
 from pyiceberg.transforms import IdentityTransform
@@ -1079,7 +1074,7 @@ def manage_snapshots(self) -> ManageSnapshots:
            ms.create_tag(snapshot_id1, "Tag_A").create_tag(snapshot_id2, "Tag_B")
         """
         return ManageSnapshots(transaction=Transaction(self, autocommit=True))
-    
+
     def expire_snapshots(self) -> ExpireSnapshots:
         """
         Shorthand to run expire snapshots by id or by a timestamp.

pyiceberg/table/update/snapshot.py

@@ -69,7 +69,6 @@
     RemoveSnapshotRefUpdate,
     RemoveSnapshotsUpdate,
     SetSnapshotRefUpdate,
-    TableMetadata,
     TableRequirement,
     TableUpdate,
     U,
@@ -87,9 +86,6 @@
 if TYPE_CHECKING:
     from pyiceberg.table import Transaction
 
-from pyiceberg.table.metadata import TableMetadata
-from pyiceberg.table.snapshots import Snapshot
-
 
 def _new_manifest_file_name(num: int, commit_uuid: uuid.UUID) -> str:
     return f"{commit_uuid}-m{num}.avro"
@@ -745,7 +741,7 @@ class ManageSnapshots(UpdateTableMetadata["ManageSnapshots"]):
        ms.create_tag(snapshot_id1, "Tag_A").create_tag(snapshot_id2, "Tag_B")
     """
 
-    _snapshot_ids_to_expire = set()
+    _snapshot_ids_to_expire: Set[int] = set()
     _updates: Tuple[TableUpdate, ...] = ()
     _requirements: Tuple[TableRequirement, ...] = ()
 
@@ -851,21 +847,24 @@ def remove_branch(self, branch_name: str) -> ManageSnapshots:
         """
         return self._remove_ref_snapshot(ref_name=branch_name)
 
+
 class ExpireSnapshots(UpdateTableMetadata["ExpireSnapshots"]):
     """
     Expire snapshots by ID.
+
     Use table.expire_snapshots().<operation>().commit() to run a specific operation.
     Use table.expire_snapshots().<operation-one>().<operation-two>().commit() to run multiple operations.
     Pending changes are applied on commit.
     """
-    
-    _snapshot_ids_to_expire = set()
+
+    _snapshot_ids_to_expire: Set[int] = set()
     _updates: Tuple[TableUpdate, ...] = ()
     _requirements: Tuple[TableRequirement, ...] = ()
 
     def _commit(self) -> UpdatesAndRequirements:
         """
         Commit the staged updates and requirements.
+
         This will remove the snapshots with the given IDs.
 
         Returns:
@@ -876,35 +875,37 @@ def _commit(self) -> UpdatesAndRequirements:
         self._updates += (update,)
         return self._updates, self._requirements
 
-    def _get_protected_snapshot_ids(self):
+    def _get_protected_snapshot_ids(self) -> Set[int]:
         """
-        Get the IDs of protected snapshots. These are the HEAD snapshots of all branches
-        and all tagged snapshots.  These ids are to be excluded from expiration.
+        Get the IDs of protected snapshots.
+
+        These are the HEAD snapshots of all branches and all tagged snapshots.  These ids are to be excluded from expiration.
+
         Returns:
             Set of protected snapshot IDs to exclude from expiration.
         """
-        protected_ids = set()
-        
+        protected_ids: Set[int] = set()
+
         for ref in self._transaction.table_metadata.refs.values():
             if ref.snapshot_ref_type in [SnapshotRefType.TAG, SnapshotRefType.BRANCH]:
                 protected_ids.add(ref.snapshot_id)
-        
+
         return protected_ids
 
     def expire_snapshot_by_id(self, snapshot_id: int) -> ExpireSnapshots:
         """
         Expire a snapshot by its ID.
 
+        This will mark the snapshot for expiration.
+
         Args:
             snapshot_id (int): The ID of the snapshot to expire.
-
         Returns:
             This for method chaining.
         """
-        
         if self._transaction.table_metadata.snapshot_by_id(snapshot_id) is None:
             raise ValueError(f"Snapshot with ID {snapshot_id} does not exist.")
-        
+
         if snapshot_id in self._get_protected_snapshot_ids():
             raise ValueError(f"Snapshot with ID {snapshot_id} is protected and cannot be expired.")
 

tests/table/test_expire_snapshots.py

@@ -31,8 +31,9 @@ def test_expire_snapshot(table_v2: Table) -> None:
         uuid=uuid4(),
     )
 
-    # Mock the commit_table method to return the mock response
-    table_v2.catalog.commit_table = MagicMock(return_value=mock_response)
+    # Mock the catalog object and its commit_table method to return the mock response
+    table_v2.catalog = MagicMock()
+    table_v2.catalog.commit_table.return_value = mock_response
 
     # Print snapshot IDs for debugging
     print(f"Snapshot IDs before expiration: {[snapshot.snapshot_id for snapshot in table_v2.metadata.snapshots]}")
@@ -46,7 +47,7 @@ def test_expire_snapshot(table_v2: Table) -> None:
     try:
         table_v2.expire_snapshots().expire_snapshot_by_id(EXPIRE_SNAPSHOT).commit()
     except Exception as e:
-        assert False, f"Commit failed with error: {e}"
+        raise AssertionError(f"Commit failed with error: {e}") from e
 
     # Assert that commit_table was called once
     table_v2.catalog.commit_table.assert_called_once()