Ruff linter fixes

Author: evertlammerts

adbc_driver_duckdb/dbapi.py

@@ -15,14 +15,14 @@
 # specific language governing permissions and limitations
 # under the License.
 
-"""
-DBAPI 2.0-compatible facade for the ADBC DuckDB driver.
+"""DBAPI 2.0-compatible facade for the ADBC DuckDB driver.
 """
 
 import typing
 
 import adbc_driver_manager
 import adbc_driver_manager.dbapi
+
 import adbc_driver_duckdb
 
 __all__ = [

duckdb/__init__.py

@@ -1,8 +1,10 @@
 # Modules
+from importlib.metadata import version
+
+from _duckdb import __version__ as duckdb_version
+
 import duckdb.functional as functional
 import duckdb.typing as typing
-from _duckdb import __version__ as duckdb_version
-from importlib.metadata import version
 
 # duckdb.__version__ returns the version of the distribution package, i.e. the pypi version
 __version__ = version("duckdb")
@@ -19,25 +21,25 @@ def version():
 
 # Classes
 from _duckdb import (
-    DuckDBPyRelation,
+    CaseExpression,
+    CoalesceOperator,
+    ColumnExpression,
+    ConstantExpression,
+    CSVLineTerminator,
+    DefaultExpression,
     DuckDBPyConnection,
-    Statement,
-    ExplainType,
-    StatementType,
+    DuckDBPyRelation,
     ExpectedResultType,
-    CSVLineTerminator,
-    PythonExceptionHandling,
-    RenderMode,
+    ExplainType,
     Expression,
-    ConstantExpression,
-    ColumnExpression,
-    DefaultExpression,
-    CoalesceOperator,
-    LambdaExpression,
-    StarExpression,
     FunctionExpression,
-    CaseExpression,
+    LambdaExpression,
+    PythonExceptionHandling,
+    RenderMode,
     SQLExpression,
+    StarExpression,
+    Statement,
+    StatementType,
 )
 
 _exported_symbols.extend(
@@ -61,91 +63,85 @@ def version():
 
 # These are overloaded twice, we define them inside of C++ so pybind can deal with it
 _exported_symbols.extend(["df", "arrow"])
-from _duckdb import df, arrow
-
 # NOTE: this section is generated by tools/pythonpkg/scripts/generate_connection_wrapper_methods.py.
 # Do not edit this section manually, your changes will be overwritten!
-
 # START OF CONNECTION WRAPPER
-
 from _duckdb import (
-    cursor,
-    register_filesystem,
-    unregister_filesystem,
-    list_filesystems,
-    filesystem_is_registered,
-    create_function,
-    remove_function,
-    sqltype,
-    dtype,
-    type,
+    aggregate,
+    alias,
+    append,
     array_type,
-    list_type,
-    union_type,
-    string_type,
-    enum_type,
+    arrow,
+    begin,
+    checkpoint,
+    close,
+    commit,
+    create_function,
+    cursor,
     decimal_type,
-    struct_type,
-    row_type,
-    map_type,
+    description,
+    df,
+    distinct,
+    dtype,
     duplicate,
+    enum_type,
     execute,
     executemany,
-    close,
-    interrupt,
-    query_progress,
-    fetchone,
-    fetchmany,
-    fetchall,
-    fetchnumpy,
-    fetchdf,
+    extract_statements,
+    fetch_arrow_table,
     fetch_df,
-    df,
     fetch_df_chunk,
-    pl,
-    fetch_arrow_table,
-    arrow,
     fetch_record_batch,
-    torch,
-    tf,
-    begin,
-    commit,
-    rollback,
-    checkpoint,
-    append,
-    register,
-    unregister,
-    table,
-    view,
-    values,
-    table_function,
-    read_json,
-    extract_statements,
-    sql,
-    query,
-    from_query,
-    read_csv,
+    fetchall,
+    fetchdf,
+    fetchmany,
+    fetchnumpy,
+    fetchone,
+    filesystem_is_registered,
+    filter,
+    from_arrow,
     from_csv_auto,
     from_df,
-    from_arrow,
-    from_parquet,
-    read_parquet,
     from_parquet,
-    read_parquet,
+    from_query,
     get_table_names,
     install_extension,
-    load_extension,
-    project,
-    distinct,
-    write_csv,
-    aggregate,
-    alias,
-    filter,
+    interrupt,
     limit,
+    list_filesystems,
+    list_type,
+    load_extension,
+    map_type,
     order,
+    pl,
+    project,
+    query,
     query_df,
-    description,
+    query_progress,
+    read_csv,
+    read_json,
+    read_parquet,
+    register,
+    register_filesystem,
+    remove_function,
+    rollback,
+    row_type,
     rowcount,
+    sql,
+    sqltype,
+    string_type,
+    struct_type,
+    table,
+    table_function,
+    tf,
+    torch,
+    type,
+    union_type,
+    unregister,
+    unregister_filesystem,
+    values,
+    view,
+    write_csv,
 )
 
 _exported_symbols.extend(
@@ -233,17 +229,17 @@ def version():
 # END OF CONNECTION WRAPPER
 
 # Enums
-from _duckdb import ANALYZE, DEFAULT, RETURN_NULL, STANDARD, COLUMNS, ROWS
+from _duckdb import ANALYZE, COLUMNS, DEFAULT, RETURN_NULL, ROWS, STANDARD
 
 _exported_symbols.extend(["ANALYZE", "DEFAULT", "RETURN_NULL", "STANDARD"])
 
 
 # read-only properties
 from _duckdb import (
-    __standard_vector_size__,
+    __formatted_python_version__,
     __interactive__,
     __jupyter__,
-    __formatted_python_version__,
+    __standard_vector_size__,
     apilevel,
     comment,
     identifier,
@@ -294,35 +290,35 @@ def version():
 
 # Exceptions
 from _duckdb import (
-    Error,
-    DataError,
+    BinderException,
+    CatalogException,
+    ConnectionException,
+    ConstraintException,
     ConversionException,
-    OutOfRangeException,
-    TypeMismatchException,
+    DataError,
+    Error,
     FatalException,
+    HTTPException,
     IntegrityError,
-    ConstraintException,
     InternalError,
     InternalException,
     InterruptException,
-    NotSupportedError,
+    InvalidInputException,
+    InvalidTypeException,
+    IOException,
     NotImplementedException,
+    NotSupportedError,
     OperationalError,
-    ConnectionException,
-    IOException,
-    HTTPException,
     OutOfMemoryException,
-    SerializationException,
-    TransactionException,
+    OutOfRangeException,
+    ParserException,
     PermissionException,
     ProgrammingError,
-    BinderException,
-    CatalogException,
-    InvalidInputException,
-    InvalidTypeException,
-    ParserException,
-    SyntaxException,
     SequenceException,
+    SerializationException,
+    SyntaxException,
+    TransactionException,
+    TypeMismatchException,
     Warning,
 )
 
@@ -363,34 +359,34 @@ def version():
 
 # Value
 from duckdb.value.constant import (
-    Value,
-    NullValue,
-    BooleanValue,
-    UnsignedBinaryValue,
-    UnsignedShortValue,
-    UnsignedIntegerValue,
-    UnsignedLongValue,
     BinaryValue,
-    ShortValue,
-    IntegerValue,
-    LongValue,
-    HugeIntegerValue,
-    FloatValue,
-    DoubleValue,
-    DecimalValue,
-    StringValue,
-    UUIDValue,
     BitValue,
     BlobValue,
+    BooleanValue,
     DateValue,
+    DecimalValue,
+    DoubleValue,
+    FloatValue,
+    HugeIntegerValue,
+    IntegerValue,
     IntervalValue,
-    TimestampValue,
-    TimestampSecondValue,
+    LongValue,
+    NullValue,
+    ShortValue,
+    StringValue,
     TimestampMilisecondValue,
     TimestampNanosecondValue,
+    TimestampSecondValue,
     TimestampTimeZoneValue,
-    TimeValue,
+    TimestampValue,
     TimeTimeZoneValue,
+    TimeValue,
+    UnsignedBinaryValue,
+    UnsignedIntegerValue,
+    UnsignedLongValue,
+    UnsignedShortValue,
+    UUIDValue,
+    Value,
 )
 
 _exported_symbols.extend(

duckdb/experimental/spark/__init__.py

@@ -1,7 +1,7 @@
-from .sql import SparkSession, DataFrame
+from ._globals import _NoValue
 from .conf import SparkConf
 from .context import SparkContext
-from ._globals import _NoValue
 from .exception import ContributionsAcceptedError
+from .sql import DataFrame, SparkSession
 
-__all__ = ["SparkSession", "DataFrame", "SparkConf", "SparkContext", "ContributionsAcceptedError"]
+__all__ = ["ContributionsAcceptedError", "DataFrame", "SparkConf", "SparkContext", "SparkSession"]

duckdb/experimental/spark/_globals.py

@@ -15,8 +15,7 @@
 # limitations under the License.
 #
 
-"""
-Module defining global singleton classes.
+"""Module defining global singleton classes.
 
 This module raises a RuntimeError if an attempt to reload it is made. In that
 way the identities of the classes defined here are fixed and will remain so

duckdb/experimental/spark/_typing.py

@@ -16,10 +16,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Callable, Iterable, Sized, TypeVar, Union
-from typing_extensions import Literal, Protocol
+from collections.abc import Iterable, Sized
+from typing import Callable, TypeVar, Union
 
-from numpy import int32, int64, float32, float64, ndarray
+from numpy import float32, float64, int32, int64, ndarray
+from typing_extensions import Literal, Protocol
 
 F = TypeVar("F", bound=Callable)
 T_co = TypeVar("T_co", covariant=True)

duckdb/experimental/spark/conf.py

@@ -1,4 +1,5 @@
-from typing import Optional, List, Tuple
+from typing import Optional
+
 from duckdb.experimental.spark.exception import ContributionsAcceptedError