fix: remove unnecessary whitespace and improve code formatting in maintenance and test files (ran: make lint)

Author: ForeverAngry

pyiceberg/table/maintenance.py

@@ -247,11 +247,11 @@ def expire_snapshots_with_retention_policy(
         """
         # Get default values from table properties
         default_max_age, default_min_snapshots, _ = self._get_expiration_properties()
-        
+
         # Use defaults from table properties if not explicitly provided
         if timestamp_ms is None:
             timestamp_ms = default_max_age
-        
+
         if min_snapshots_to_keep is None:
             min_snapshots_to_keep = default_min_snapshots
 
@@ -266,9 +266,7 @@ def expire_snapshots_with_retention_policy(
             raise ValueError("min_snapshots_to_keep must be at least 1")
 
         snapshots_to_expire = self._get_snapshots_to_expire_with_retention(
-            timestamp_ms=timestamp_ms,
-            retain_last_n=retain_last_n,
-            min_snapshots_to_keep=min_snapshots_to_keep
+            timestamp_ms=timestamp_ms, retain_last_n=retain_last_n, min_snapshots_to_keep=min_snapshots_to_keep
         )
 
         if snapshots_to_expire:

tests/table/test_dedup_data_file_filepaths.py

@@ -17,7 +17,7 @@
 import os
 import uuid
 from pathlib import Path
-from typing import List, Set, Generator
+from typing import Generator, List, Set
 
 import pyarrow as pa
 import pyarrow.parquet as pq
@@ -35,7 +35,7 @@ def iceberg_catalog(tmp_path: Path) -> Generator[InMemoryCatalog, None, None]:
     catalog.create_namespace("default")
     yield catalog
     # Clean up SQLAlchemy engine connections
-    if hasattr(catalog, 'engine'):
+    if hasattr(catalog, "engine"):
         try:
             catalog.engine.dispose()
         except Exception:
@@ -92,9 +92,9 @@ def prepopulated_table(iceberg_catalog: InMemoryCatalog, dupe_data_file_path: Pa
     tx2.commit_transaction()
 
     yield table
-    
+
     # Cleanup table's catalog connections
-    if hasattr(table, '_catalog') and hasattr(table._catalog, 'engine'):
+    if hasattr(table, "_catalog") and hasattr(table._catalog, "engine"):
         try:
             table._catalog.engine.dispose()
         except Exception:
@@ -133,9 +133,9 @@ def test_get_all_datafiles_all_snapshots(prepopulated_table: Table, dupe_data_fi
         assert dupe_data_file_path.name in file_paths
     finally:
         # Ensure catalog connections are properly closed
-        if hasattr(prepopulated_table, '_catalog'):
+        if hasattr(prepopulated_table, "_catalog"):
             catalog = prepopulated_table._catalog
-            if hasattr(catalog, '_connection') and catalog._connection is not None:
+            if hasattr(catalog, "_connection") and catalog._connection is not None:
                 try:
                     catalog._connection.close()
                 except Exception:

tests/table/test_retention_strategies.py

@@ -37,10 +37,10 @@ def test_retain_last_n_snapshots(table_v2: Table) -> None:
         (5, 5000),
     ]
     snapshots = _make_snapshots(ids_and_ts)
-    
+
     # Save original catalog for cleanup
     original_catalog = table_v2.catalog
-    
+
     try:
         table_v2.metadata = table_v2.metadata.model_copy(update={"snapshots": snapshots, "refs": {}})
         table_v2.catalog = MagicMock()
@@ -61,7 +61,7 @@ def test_retain_last_n_snapshots(table_v2: Table) -> None:
     finally:
         # Restore original catalog and cleanup
         table_v2.catalog = original_catalog
-        if hasattr(original_catalog, '_connection') and original_catalog._connection is not None:
+        if hasattr(original_catalog, "_connection") and original_catalog._connection is not None:
             try:
                 original_catalog._connection.close()
             except Exception:
@@ -78,10 +78,10 @@ def test_min_snapshots_to_keep(table_v2: Table) -> None:
         (5, 5000),
     ]
     snapshots = _make_snapshots(ids_and_ts)
-    
+
     # Save original catalog for cleanup
     original_catalog = table_v2.catalog
-    
+
     try:
         table_v2.metadata = table_v2.metadata.model_copy(update={"snapshots": snapshots, "refs": {}})
         table_v2.catalog = MagicMock()
@@ -101,7 +101,7 @@ def test_min_snapshots_to_keep(table_v2: Table) -> None:
     finally:
         # Restore original catalog and cleanup
         table_v2.catalog = original_catalog
-        if hasattr(original_catalog, '_connection') and original_catalog._connection is not None:
+        if hasattr(original_catalog, "_connection") and original_catalog._connection is not None:
             try:
                 original_catalog._connection.close()
             except Exception:
@@ -336,7 +336,7 @@ def test_expire_snapshots_by_ids(table_v2: Table) -> None:
     finally:
         # Restore original catalog and cleanup any connections
         table_v2.catalog = original_catalog
-        if hasattr(original_catalog, '_connection') and original_catalog._connection is not None:
+        if hasattr(original_catalog, "_connection") and original_catalog._connection is not None:
             try:
                 original_catalog._connection.close()
             except Exception:
@@ -354,13 +354,13 @@ def test_expire_snapshots_with_table_property_defaults(table_v2: Table) -> None:
         (5, 5000),  # Should be kept (newer than max age)
     ]
     snapshots = _make_snapshots(ids_and_ts)
-    
+
     # Set table properties
     properties = {
         "history.expire.max-snapshot-age-ms": "4500",  # Keep snapshots newer than this
-        "history.expire.min-snapshots-to-keep": "3",   # Always keep at least 3 snapshots
+        "history.expire.min-snapshots-to-keep": "3",  # Always keep at least 3 snapshots
     }
-    
+
     table_v2.metadata = table_v2.metadata.model_copy(
         update={
             "snapshots": snapshots,
@@ -399,13 +399,13 @@ def test_explicit_parameters_override_table_properties(table_v2: Table) -> None:
         (5, 5000),  # Will be kept (min snapshots)
     ]
     snapshots = _make_snapshots(ids_and_ts)
-    
+
     # Set table properties that are more aggressive than what we'll use
     properties = {
         "history.expire.max-snapshot-age-ms": "1500",  # Would expire more snapshots
-        "history.expire.min-snapshots-to-keep": "2",   # Would keep fewer snapshots
+        "history.expire.min-snapshots-to-keep": "2",  # Would keep fewer snapshots
     }
-    
+
     table_v2.metadata = table_v2.metadata.model_copy(
         update={
             "snapshots": snapshots,
@@ -427,7 +427,7 @@ def test_explicit_parameters_override_table_properties(table_v2: Table) -> None:
     # Call expire with explicit parameters that should override the properties
     table_v2.maintenance.expire_snapshots_with_retention_policy(
         timestamp_ms=1500,  # Only expire snapshots older than this
-        min_snapshots_to_keep=4  # Keep at least 4 snapshots (overrides property of 2)
+        min_snapshots_to_keep=4,  # Keep at least 4 snapshots (overrides property of 2)
     )
 
     table_v2.catalog.commit_table.assert_called_once()
@@ -447,7 +447,7 @@ def test_expire_snapshots_no_properties_no_parameters(table_v2: Table) -> None:
         (5, 5000),
     ]
     snapshots = _make_snapshots(ids_and_ts)
-    
+
     table_v2.metadata = table_v2.metadata.model_copy(
         update={
             "snapshots": snapshots,