Merge pull request #120 from fpgmaas/chore/improve-ruff

chore: enable `F401` and `F403`

chispa/__init__.py

@@ -4,7 +4,7 @@
 
 # Add PySpark to the library path based on the value of SPARK_HOME if pyspark is not already in our path
 try:
-    from pyspark import context
+    from pyspark import context  # noqa: F401
 except ImportError:
     # We need to add PySpark, try use findspark, or failback to the "manually" find it
     try:
@@ -68,3 +68,16 @@ def assert_df_equality(
             ignore_metadata,
             self.formats,
         )
+
+
+__all__ = (
+    "DataFramesNotEqualError",
+    "assert_df_equality",
+    "assert_approx_df_equality",
+    "ColumnsNotEqualError",
+    "assert_column_equality",
+    "assert_approx_column_equality",
+    "assert_basic_rows_equality",
+    "DefaultFormats",
+    "Chispa",
+)

chispa/column_comparer.py

@@ -1,4 +1,4 @@
-from chispa.bcolors import *
+from chispa.bcolors import bcolors
 from prettytable import PrettyTable
 
 

chispa/rows_comparer.py

@@ -1,6 +1,5 @@
 from itertools import zip_longest
 from prettytable import PrettyTable
-from chispa.bcolors import *
 import chispa
 from chispa.terminal_str_formatter import format_string
 from chispa.default_formats import DefaultFormats

chispa/schema_comparer.py

@@ -1,5 +1,5 @@
 from prettytable import PrettyTable
-from chispa.bcolors import *
+from chispa.bcolors import blue
 from itertools import zip_longest
 
 

chispa/structfield_comparer.py

@@ -1,3 +1,3 @@
 from chispa.schema_comparer import are_structfields_equal
 
-__all__ = "are_structfields_equal"
+__all__ = ("are_structfields_equal",)

pyproject.toml

@@ -70,8 +70,6 @@ preview = true
 [tool.ruff.lint]
 ignore = [
     "E501",  # Line too long
-    "F401",  # imported but unused;
-    "F403",  # `from X import *` used; unable to detect undefined names
     "F405",  # X may be undefined, or defined from star imports
     "F841",  # Local variable `e_info` is assigned to but never used
 ]

tests/test_column_comparer.py

@@ -1,7 +1,7 @@
 import pytest
 
 from .spark import spark
-from chispa import *
+from chispa import assert_column_equality, ColumnsNotEqualError, assert_approx_column_equality
 
 
 def describe_assert_column_equality():

tests/test_dataframe_comparer.py

@@ -1,7 +1,7 @@
 import pytest
 
-from .spark import *
-from chispa import *
+from .spark import spark
+from chispa import assert_df_equality, DataFramesNotEqualError, assert_approx_df_equality
 from chispa.dataframe_comparer import are_dfs_equal
 from chispa.schema_comparer import SchemasNotEqualError
 import math

tests/test_readme_examples.py

@@ -1,9 +1,18 @@
 import pytest
 
-from chispa import *
+from chispa import (
+    assert_column_equality,
+    ColumnsNotEqualError,
+    assert_df_equality,
+    DataFramesNotEqualError,
+    assert_approx_df_equality,
+    assert_approx_column_equality,
+    assert_basic_rows_equality,
+)
 import pyspark.sql.functions as F
 from chispa.schema_comparer import SchemasNotEqualError
-from pyspark.sql.types import *
+from pyspark.sql.types import StringType, IntegerType, DoubleType, StructField, StructType, ArrayType
+
 
 from pyspark.sql import SparkSession
 

tests/test_row_comparer.py

@@ -1,5 +1,4 @@
-from .spark import *
-from chispa.row_comparer import *
+from chispa.row_comparer import are_rows_equal_enhanced, are_rows_equal, are_rows_approx_equal
 from pyspark.sql import Row
 
 

tests/test_rows_comparer.py

@@ -1,8 +1,7 @@
 import pytest
 
-from .spark import *
-from chispa import *
-from chispa.rows_comparer import assert_basic_rows_equality
+from .spark import spark
+from chispa import assert_basic_rows_equality
 from chispa import DataFramesNotEqualError
 
 

tests/test_schema_comparer.py

@@ -1,7 +1,13 @@
 import pytest
 
-from pyspark.sql.types import *
-from chispa.schema_comparer import *
+from pyspark.sql.types import StringType, IntegerType, DoubleType, StructField, StructType, ArrayType
+from chispa.schema_comparer import (
+    assert_schema_equality,
+    SchemasNotEqualError,
+    assert_schema_equality_ignore_nullable,
+    are_schemas_equal_ignore_nullable,
+    are_structfields_equal,
+)
 
 
 def describe_assert_schema_equality():

tests/test_structfield_comparer.py

@@ -1,5 +1,5 @@
 from chispa.structfield_comparer import are_structfields_equal
-from pyspark.sql.types import *
+from pyspark.sql.types import StructField, IntegerType, StructType, DoubleType
 
 
 def describe_are_structfields_equal():