Ruff B: Fixed last bugbear linting issues

Author: evertlammerts

duckdb/experimental/spark/sql/functions.py

@@ -1495,7 +1495,7 @@ def approxCountDistinct(col: "ColumnOrName", rsd: Optional[float] = None) -> Col
     .. deprecated:: 2.1.0
         Use :func:`approx_count_distinct` instead.
     """
-    warnings.warn("Deprecated in 2.1, use approx_count_distinct instead.", FutureWarning)
+    warnings.warn("Deprecated in 2.1, use approx_count_distinct instead.", FutureWarning, stacklevel=3)
     return approx_count_distinct(col, rsd)
 
 

duckdb/experimental/spark/sql/types.py

@@ -855,7 +855,7 @@ def __getitem__(self, key: Union[str, int]) -> StructField:
                 return self.fields[key]
             except IndexError:
                 msg = "StructType index out of range"
-                raise IndexError(msg)
+                raise IndexError(msg)  # noqa: B904
         elif isinstance(key, slice):
             return StructType(self.fields[key])
         else:
@@ -1194,9 +1194,9 @@ def __getitem__(self, item: Any) -> Any:  # noqa: D105, ANN401
             idx = self.__fields__.index(item)
             return super(Row, self).__getitem__(idx)
         except IndexError:
-            raise KeyError(item)
+            raise KeyError(item)  # noqa: B904
         except ValueError:
-            raise ValueError(item)
+            raise ValueError(item)  # noqa: B904
 
     def __getattr__(self, item: str) -> Any:  # noqa: D105, ANN401
         if item.startswith("__"):
@@ -1207,9 +1207,9 @@ def __getattr__(self, item: str) -> Any:  # noqa: D105, ANN401
             idx = self.__fields__.index(item)
             return self[idx]
         except IndexError:
-            raise AttributeError(item)
+            raise AttributeError(item)  # noqa: B904
         except ValueError:
-            raise AttributeError(item)
+            raise AttributeError(item)  # noqa: B904
 
     def __setattr__(self, key: Any, value: Any) -> None:  # noqa: D105, ANN401
         if key != "__fields__":

duckdb/polars_io.py

@@ -56,7 +56,7 @@ def _pl_operation_to_sql(op: str) -> str:
             "Or": "OR",
         }[op]
     except KeyError:
-        raise NotImplementedError(op)
+        raise NotImplementedError(op)  # noqa: B904
 
 
 def _escape_sql_identifier(identifier: str) -> str:

duckdb_packaging/_versioning.py

@@ -173,6 +173,6 @@ def get_git_describe(
         )
         result.check_returncode()
         return result.stdout.strip()
-    except FileNotFoundError:
+    except FileNotFoundError as e:
         msg = "git executable can't be found"
-        raise RuntimeError(msg)
+        raise RuntimeError(msg) from e

duckdb_packaging/setuptools_scm_version.py

@@ -56,7 +56,7 @@ def version_scheme(version: _VersionObject) -> str:
         return _bump_dev_version(str(version.tag), distance)
     except Exception as e:
         msg = f"Failed to bump version: {e}"
-        raise RuntimeError(msg)
+        raise RuntimeError(msg) from e
 
 
 def _tag_to_version(tag: str) -> str:

scripts/generate_import_cache_cpp.py

@@ -173,7 +173,7 @@ def to_string(self):
 
 
 files: list[ModuleFile] = []
-for name, value in json_data.items():
+for value in json_data.values():
     if value["full_path"] != value["name"]:
         continue
     files.append(ModuleFile(value))

tests/fast/api/test_duckdb_connection.py

@@ -186,8 +186,8 @@ def test_fetch_arrow_table(self):
         duckdb.execute("Create Table test (a integer)")
 
         for i in range(1024):
-            for j in range(2):
-                duckdb.execute("Insert Into test values ('" + str(i) + "')")
+            duckdb.execute("Insert Into test values ('" + str(i) + "')")
+            duckdb.execute("Insert Into test values ('" + str(i) + "')")
         duckdb.execute("Insert Into test values ('5000')")
         duckdb.execute("Insert Into test values ('6000')")
         sql = """

tests/fast/arrow/test_2426.py

@@ -15,7 +15,7 @@ def test_2426(self, duckdb_cursor):
         con.execute("Create Table test (a integer)")
 
         for i in range(1024):
-            for j in range(2):
+            for _j in range(2):
                 con.execute("Insert Into test values ('" + str(i) + "')")
         con.execute("Insert Into test values ('5000')")
         con.execute("Insert Into test values ('6000')")

tests/fast/arrow/test_arrow_fetch_recordbatch.py

@@ -280,7 +280,7 @@ def test_many_chunk_sizes(self):
             query = duckdb_cursor.execute("SELECT a FROM t")
             record_batch_reader = query.fetch_record_batch(i)
             num_loops = int(object_size / i)
-            for j in range(num_loops):
+            for _j in range(num_loops):
                 assert record_batch_reader.schema.names == ["a"]
                 chunk = record_batch_reader.read_next_batch()
                 assert len(chunk) == i

tests/fast/arrow/test_arrow_replacement_scan.py

@@ -17,7 +17,7 @@ def test_arrow_table_replacement_scan(self, duckdb_cursor):
 
         con = duckdb.connect()
 
-        for i in range(5):
+        for _i in range(5):
             assert con.execute("select count(*) from userdata_parquet_table").fetchone() == (1000,)
             assert con.execute("select count(*) from df").fetchone() == (1000,)