More lints

Author: timsaucer

pyproject.toml

@@ -89,13 +89,9 @@ ignore = [
     "PLR0913", # Allow many arguments in function definition
     "PD901",   # Allow variable name df
     "N812",    # Allow importing functions as `F`
+    "A005",    # Allow module named io
     # TODO: Enable all of the following, but this PR is getting too large already
     "PTH",
-    "DTZ007",
-    "RUF015",
-    "A005",
-    "TC001",
-    "UP035",
 ]
 
 [tool.ruff.lint.pydocstyle]
@@ -124,7 +120,7 @@ extend-allowed-calls = ["lit", "datafusion.lit"]
     "PLR0913",
     "PT004",
 ]
-"examples/*" = ["D", "W505", "E501", "T201", "S101", "PLR2004", "ANN001", "ANN202", "INP001"]
+"examples/*" = ["D", "W505", "E501", "T201", "S101", "PLR2004", "ANN001", "ANN202", "INP001", "DTZ007", "RUF015"]
 "dev/*" = ["D", "E", "T", "S", "PLR", "C", "SIM", "UP", "EXE", "N817", "ERA001", "ANN001"]
 "benchmarks/*" = ["D", "F", "T", "BLE", "FURB", "PLR", "E", "TD", "TRY", "S", "SIM", "EXE", "UP", "ERA001", "ANN001", "INP001"]
 "docs/*" = ["D"]

python/datafusion/dataframe.py

@@ -22,11 +22,10 @@
 from __future__ import annotations
 
 import warnings
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
-    Iterable,
     Literal,
     overload,
 )
@@ -55,7 +54,7 @@
 
 if TYPE_CHECKING:
     import pathlib
-    from typing import Callable
+    from collections.abc import Callable
 
     import pandas as pd
     import polars as pl

python/datafusion/dataframe_formatter.py

@@ -19,14 +19,17 @@
 from __future__ import annotations
 
 from typing import (
+    TYPE_CHECKING,
     Any,
-    Callable,
     Protocol,
     runtime_checkable,
 )
 
 from datafusion._internal import DataFrame as DataFrameInternal
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 
 def _validate_positive_int(value: Any, param_name: str) -> None:
     """Validate that a parameter is a positive integer.

python/datafusion/expr.py

@@ -22,7 +22,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, ClassVar, Iterable, Sequence
+from collections.abc import Iterable, Sequence
+from typing import TYPE_CHECKING, Any, ClassVar
 
 try:
     from warnings import deprecated  # Python 3.13+

python/datafusion/user_defined.py

@@ -22,7 +22,7 @@
 import functools
 from abc import ABCMeta, abstractmethod
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Callable, Protocol, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Protocol, TypeVar, overload
 
 import pyarrow as pa
 
@@ -31,6 +31,7 @@
 
 if TYPE_CHECKING:
     _R = TypeVar("_R", bound=pa.DataType)
+    from collections.abc import Callable
 
 
 class Volatility(Enum):

python/tests/test_pyclass_frozen.py

@@ -22,7 +22,10 @@
 import re
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterator
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
 
 PYCLASS_RE = re.compile(
     r"#\[\s*pyclass\s*(?:\((?P<args>.*?)\))?\s*\]",