Ruff FBT001: fixed most boolean params

Author: evertlammerts

duckdb/__init__.pyi

@@ -354,7 +354,7 @@ class DuckDBPyConnection:
         field_appearance_threshold: Optional[float] = None,
         map_inference_threshold: Optional[int] = None,
         maximum_sample_files: Optional[int] = None,
-        filename: Optional[bool | str] = None,
+        filename: Optional[Union[bool, str]] = None,
         hive_partitioning: Optional[bool] = None,
         union_by_name: Optional[bool] = None,
         hive_types: Optional[Dict[str, str]] = None,
@@ -368,12 +368,12 @@ class DuckDBPyConnection:
         self,
         path_or_buffer: Union[str, StringIO, TextIOBase],
         *,
-        header: Optional[bool | int] = None,
+        header: Optional[Union[bool, int]] = None,
         compression: Optional[str] = None,
         sep: Optional[str] = None,
         delimiter: Optional[str] = None,
-        dtype: Optional[Dict[str, str] | List[str]] = None,
-        na_values: Optional[str | List[str]] = None,
+        dtype: Optional[Union[Dict[str, str], List[str]]] = None,
+        na_values: Optional[Union[str, List[str]]] = None,
         skiprows: Optional[int] = None,
         quotechar: Optional[str] = None,
         escapechar: Optional[str] = None,
@@ -399,7 +399,7 @@ class DuckDBPyConnection:
         buffer_size: Optional[int] = None,
         decimal: Optional[str] = None,
         allow_quoted_nulls: Optional[bool] = None,
-        filename: Optional[bool | str] = None,
+        filename: Optional[Union[bool, str]] = None,
         hive_partitioning: Optional[bool] = None,
         union_by_name: Optional[bool] = None,
         hive_types: Optional[Dict[str, str]] = None,
@@ -409,12 +409,12 @@ class DuckDBPyConnection:
         self,
         path_or_buffer: Union[str, StringIO, TextIOBase],
         *,
-        header: Optional[bool | int] = None,
+        header: Optional[Union[bool, int]] = None,
         compression: Optional[str] = None,
         sep: Optional[str] = None,
         delimiter: Optional[str] = None,
-        dtype: Optional[Dict[str, str] | List[str]] = None,
-        na_values: Optional[str | List[str]] = None,
+        dtype: Optional[Union[Dict[str, str], List[str]]] = None,
+        na_values: Optional[Union[str, List[str]]] = None,
         skiprows: Optional[int] = None,
         quotechar: Optional[str] = None,
         escapechar: Optional[str] = None,
@@ -440,7 +440,7 @@ class DuckDBPyConnection:
         buffer_size: Optional[int] = None,
         decimal: Optional[str] = None,
         allow_quoted_nulls: Optional[bool] = None,
-        filename: Optional[bool | str] = None,
+        filename: Optional[Union[bool, str]] = None,
         hive_partitioning: Optional[bool] = None,
         union_by_name: Optional[bool] = None,
         hive_types: Optional[Dict[str, str]] = None,
@@ -655,7 +655,7 @@ class DuckDBPyRelation:
     def distinct(self) -> DuckDBPyRelation: ...
     def except_(self, other_rel: DuckDBPyRelation) -> DuckDBPyRelation: ...
     def execute(self, *args, **kwargs) -> DuckDBPyRelation: ...
-    def explain(self, type: Optional[Literal["standard", "analyze"] | int] = "standard") -> str: ...
+    def explain(self, type: Optional[Union[Literal["standard", "analyze"], int]] = "standard") -> str: ...
     def fetchall(self) -> List[Any]: ...
     def fetchmany(self, size: int = ...) -> List[Any]: ...
     def fetchnumpy(self) -> dict: ...
@@ -707,7 +707,7 @@ class DuckDBPyRelation:
         escapechar: Optional[str] = None,
         date_format: Optional[str] = None,
         timestamp_format: Optional[str] = None,
-        quoting: Optional[str | int] = None,
+        quoting: Optional[Union[str, int]] = None,
         encoding: Optional[str] = None,
         compression: Optional[str] = None,
         write_partition_columns: Optional[bool] = None,
@@ -721,8 +721,8 @@ class DuckDBPyRelation:
         self,
         file_name: str,
         compression: Optional[str] = None,
-        field_ids: Optional[dict | str] = None,
-        row_group_size_bytes: Optional[int | str] = None,
+        field_ids: Optional[Union[dict, str]] = None,
+        row_group_size_bytes: Optional[Union[int, str]] = None,
         row_group_size: Optional[int] = None,
         partition_by: Optional[List[str]] = None,
         write_partition_columns: Optional[bool] = None,
@@ -748,7 +748,7 @@ class DuckDBPyRelation:
         escapechar: Optional[str] = None,
         date_format: Optional[str] = None,
         timestamp_format: Optional[str] = None,
-        quoting: Optional[str | int] = None,
+        quoting: Optional[Union[str, int]] = None,
         encoding: Optional[str] = None,
         compression: Optional[str] = None,
         write_partition_columns: Optional[bool] = None,
@@ -761,8 +761,8 @@ class DuckDBPyRelation:
         self,
         file_name: str,
         compression: Optional[str] = None,
-        field_ids: Optional[dict | str] = None,
-        row_group_size_bytes: Optional[int | str] = None,
+        field_ids: Optional[Union[dict, str]] = None,
+        row_group_size_bytes: Optional[Union[int, str]] = None,
         row_group_size: Optional[int] = None,
         partition_by: Optional[List[str]] = None,
         write_partition_columns: Optional[bool] = None,
@@ -956,7 +956,7 @@ def read_json(
     field_appearance_threshold: Optional[float] = None,
     map_inference_threshold: Optional[int] = None,
     maximum_sample_files: Optional[int] = None,
-    filename: Optional[bool | str] = None,
+    filename: Optional[Union[bool, str]] = None,
     hive_partitioning: Optional[bool] = None,
     union_by_name: Optional[bool] = None,
     hive_types: Optional[Dict[str, str]] = None,
@@ -976,12 +976,12 @@ def from_query(
 def read_csv(
     path_or_buffer: Union[str, StringIO, TextIOBase],
     *,
-    header: Optional[bool | int] = None,
+    header: Optional[Union[bool, int]] = None,
     compression: Optional[str] = None,
     sep: Optional[str] = None,
     delimiter: Optional[str] = None,
-    dtype: Optional[Dict[str, str] | List[str]] = None,
-    na_values: Optional[str | List[str]] = None,
+    dtype: Optional[Union[Dict[str, str], List[str]]] = None,
+    na_values: Optional[Union[str, List[str]]] = None,
     skiprows: Optional[int] = None,
     quotechar: Optional[str] = None,
     escapechar: Optional[str] = None,
@@ -1007,7 +1007,7 @@ def read_csv(
     buffer_size: Optional[int] = None,
     decimal: Optional[str] = None,
     allow_quoted_nulls: Optional[bool] = None,
-    filename: Optional[bool | str] = None,
+    filename: Optional[Union[bool, str]] = None,
     hive_partitioning: Optional[bool] = None,
     union_by_name: Optional[bool] = None,
     hive_types: Optional[Dict[str, str]] = None,
@@ -1017,12 +1017,12 @@ def read_csv(
 def from_csv_auto(
     path_or_buffer: Union[str, StringIO, TextIOBase],
     *,
-    header: Optional[bool | int] = None,
+    header: Optional[Union[bool, int]] = None,
     compression: Optional[str] = None,
     sep: Optional[str] = None,
     delimiter: Optional[str] = None,
-    dtype: Optional[Dict[str, str] | List[str]] = None,
-    na_values: Optional[str | List[str]] = None,
+    dtype: Optional[Union[Dict[str, str], List[str]]] = None,
+    na_values: Optional[Union[str, List[str]]] = None,
     skiprows: Optional[int] = None,
     quotechar: Optional[str] = None,
     escapechar: Optional[str] = None,
@@ -1048,7 +1048,7 @@ def from_csv_auto(
     buffer_size: Optional[int] = None,
     decimal: Optional[str] = None,
     allow_quoted_nulls: Optional[bool] = None,
-    filename: Optional[bool | str] = None,
+    filename: Optional[Union[bool, str]] = None,
     hive_partitioning: Optional[bool] = None,
     union_by_name: Optional[bool] = None,
     hive_types: Optional[Dict[str, str]] = None,
@@ -1105,7 +1105,7 @@ def write_csv(
     escapechar: Optional[str] = None,
     date_format: Optional[str] = None,
     timestamp_format: Optional[str] = None,
-    quoting: Optional[str | int] = None,
+    quoting: Optional[Union[str, int]] = None,
     encoding: Optional[str] = None,
     compression: Optional[str] = None,
     overwrite: Optional[bool] = None,
@@ -1117,7 +1117,7 @@ def write_csv(
 ) -> None: ...
 def aggregate(
     df: pandas.DataFrame,
-    aggr_expr: str | List[Expression],
+    aggr_expr: Union[str, List[Expression]],
     group_expr: str = "",
     *,
     connection: DuckDBPyConnection = ...,

duckdb/experimental/spark/sql/catalog.py

@@ -1,4 +1,4 @@
-from typing import NamedTuple, Optional  # noqa: D100
+from typing import NamedTuple, Optional, Union  # noqa: D100
 
 from .session import SparkSession
 
@@ -63,7 +63,7 @@ def listColumns(self, tableName: str, dbName: Optional[str] = None) -> list[Colu
             query += f" and database_name = '{dbName}'"
         res = self._session.conn.sql(query).fetchall()
 
-        def transform_to_column(x: list[str | bool]) -> Column:
+        def transform_to_column(x: list[Union[str, bool]]) -> Column:
             return Column(name=x[0], description=None, dataType=x[1], nullable=x[2], isPartition=False, isBucket=False)
 
         columns = [transform_to_column(x) for x in res]

duckdb/experimental/spark/sql/functions.py

@@ -90,7 +90,7 @@ def ucase(str: "ColumnOrName") -> Column:
     return upper(str)
 
 
-def when(condition: "Column", value: Column | str) -> Column:  # noqa: D103
+def when(condition: "Column", value: Union[Column, str]) -> Column:  # noqa: D103
     if not isinstance(condition, Column):
         msg = "condition should be a Column"
         raise TypeError(msg)
@@ -99,7 +99,7 @@ def when(condition: "Column", value: Column | str) -> Column:  # noqa: D103
     return Column(expr)
 
 
-def _inner_expr_or_val(val: Column | str) -> Column | str:
+def _inner_expr_or_val(val: Union[Column, str]) -> Union[Column, str]:
     return val.expr if isinstance(val, Column) else val
 
 
@@ -842,7 +842,7 @@ def collect_list(col: "ColumnOrName") -> Column:
     return array_agg(col)
 
 
-def array_append(col: "ColumnOrName", value: Column | str) -> Column:
+def array_append(col: "ColumnOrName", value: Union[Column, str]) -> Column:
     """Collection function: returns an array of the elements in col1 along
     with the added element in col2 at the last of the array.
 
@@ -876,7 +876,7 @@ def array_append(col: "ColumnOrName", value: Column | str) -> Column:
     return _invoke_function("list_append", _to_column_expr(col), _get_expr(value))
 
 
-def array_insert(arr: "ColumnOrName", pos: Union["ColumnOrName", int], value: Column | str) -> Column:
+def array_insert(arr: "ColumnOrName", pos: Union["ColumnOrName", int], value: Union[Column, str]) -> Column:
     """Collection function: adds an item into a given array at a specified array index.
     Array indices start at 1, or start from the end if index is negative.
     Index above array size appends the array, or prepends the array if index is negative,
@@ -969,7 +969,7 @@ def array_insert(arr: "ColumnOrName", pos: Union["ColumnOrName", int], value: Co
     )
 
 
-def array_contains(col: "ColumnOrName", value: Column | str) -> Column:
+def array_contains(col: "ColumnOrName", value: Union[Column, str]) -> Column:
     """Collection function: returns null if the array is null, true if the array contains the
     given value, and false otherwise.
 

duckdb/experimental/spark/sql/session.py

@@ -111,7 +111,7 @@ def construct_parameters(tuples: Iterable) -> list[list]:
         return DataFrame(rel, self)
 
     def _createDataFrameFromPandas(
-        self, data: "PandasDataFrame", types: list[str] | None, names: list[str] | None
+        self, data: "PandasDataFrame", types: Union[list[str], None], names: Union[list[str], None]
     ) -> DataFrame:
         df = self._create_dataframe(data)
 

duckdb/experimental/spark/sql/types.py

@@ -1181,7 +1181,7 @@ def asDict(self, recursive: bool = False) -> dict[str, Any]:
 
         if recursive:
 
-            def conv(obj: Row | list | dict | object) -> list | dict | object:
+            def conv(obj: Union[Row, list, dict, object]) -> Union[list, dict, object]:
                 if isinstance(obj, Row):
                     return obj.asDict(True)
                 elif isinstance(obj, list):

duckdb/query_graph/__main__.py

@@ -268,7 +268,7 @@ def generate_ipython(json_input: str) -> str:  # noqa: D103
     )
 
 
-def generate_style_html(graph_json: str, include_meta_info: bool) -> None:  # noqa: D103
+def generate_style_html(graph_json: str, include_meta_info: bool) -> None:  # noqa: D103, FBT001
     treeflex_css = '<link rel="stylesheet" href="https://unpkg.com/treeflex/dist/css/treeflex.css">\n'
     css = "<style>\n"
     css += qgraph_css + "\n"

duckdb_packaging/_versioning.py

@@ -148,7 +148,7 @@ def strip_post_from_version(version: str) -> str:
 
 
 def get_git_describe(
-    repo_path: Optional[pathlib.Path] = None, since_major: bool = False, since_minor: bool = False
+    repo_path: Optional[pathlib.Path] = None, since_major: bool = False, since_minor: bool = False  # noqa: FBT001
 ) -> Optional[str]:
     """Get git describe output for version determination.
 

duckdb_packaging/build_backend.py

@@ -44,14 +44,13 @@
 _FORCED_PEP440_VERSION = forced_version_from_env()
 
 
-def _log(msg: str, is_error: bool = False) -> None:
+def _log(msg: str) -> None:
     """Log a message with build backend prefix.
 
     Args:
         msg: The message to log.
-        is_error: If True, log to stderr; otherwise log to stdout.
     """
-    print(_LOGGING_FORMAT.format(msg), flush=True, file=sys.stderr if is_error else sys.stdout)
+    print(_LOGGING_FORMAT.format(msg), flush=True, file=sys.stderr)
 
 
 def _in_git_repository() -> bool:
@@ -135,7 +134,7 @@ def _read_duckdb_long_version() -> str:
 
 
 def _skbuild_config_add(
-    key: str, value: Union[list, str], config_settings: dict[str, Union[list[str], str]], fail_if_exists: bool = False
+    key: str, value: Union[list, str], config_settings: dict[str, Union[list[str], str]]
 ) -> None:
     """Add or modify a configuration setting for scikit-build-core.
 
@@ -146,10 +145,9 @@ def _skbuild_config_add(
         key: The configuration key to set (will be prefixed with 'skbuild.' if needed).
         value: The value to add (string or list).
         config_settings: The configuration dictionary to modify.
-        fail_if_exists: If True, raise an error if the key already exists.
 
     Raises:
-        RuntimeError: If fail_if_exists is True and key exists, or on type mismatches.
+        RuntimeError: If this would overwrite an existing value, or on type mismatches.
         AssertionError: If config_settings is None.
 
     Behavior Rules:
@@ -172,16 +170,13 @@ def _skbuild_config_add(
     val_is_list = isinstance(value, list)
     if not key_exists:
         config_settings[store_key] = value
-    elif fail_if_exists:
-        msg = f"{key} already present in config and may not be overridden"
-        raise RuntimeError(msg)
     elif key_exists_as_list and val_is_list:
         config_settings[store_key].extend(value)
     elif key_exists_as_list and val_is_str:
         config_settings[store_key].append(value)
     elif key_exists_as_str and val_is_str:
-        _log(f"WARNING: overriding existing value in {store_key}")
-        config_settings[store_key] = value
+        msg = f"{key} already present in config and may not be overridden"
+        raise RuntimeError(msg)
     else:
         msg = f"Type mismatch: cannot set {store_key} ({type(config_settings[store_key])}) to `{value}` ({type(value)})"
         raise RuntimeError(msg)