Ruff linting

Author: evertlammerts

tests/fast/adbc/test_adbc.py

@@ -137,10 +137,9 @@ def test_commit(tmp_path):
         driver=driver_path,
         entrypoint="duckdb_adbc_init",
         db_kwargs=db_kwargs,
-    ) as conn:
-        with conn.cursor() as cur:
-            cur.execute("SELECT count(*) from ingest")
-            assert cur.fetch_arrow_table().to_pydict() == {"count_star()": [4]}
+    ) as conn, conn.cursor() as cur:
+        cur.execute("SELECT count(*) from ingest")
+        assert cur.fetch_arrow_table().to_pydict() == {"count_star()": [4]}
 
 
 def test_connection_get_table_schema(duck_conn):
@@ -308,11 +307,10 @@ def test_large_chunk(tmp_path):
         entrypoint="duckdb_adbc_init",
         db_kwargs=db_kwargs,
         autocommit=True,
-    ) as conn:
-        with conn.cursor() as cur:
-            cur.adbc_ingest("ingest", table, "create")
-            cur.execute("SELECT count(*) from ingest")
-            assert cur.fetch_arrow_table().to_pydict() == {"count_star()": [30_000]}
+    ) as conn, conn.cursor() as cur:
+        cur.adbc_ingest("ingest", table, "create")
+        cur.execute("SELECT count(*) from ingest")
+        assert cur.fetch_arrow_table().to_pydict() == {"count_star()": [30_000]}
 
 
 def test_dictionary_data(tmp_path):
@@ -332,13 +330,12 @@ def test_dictionary_data(tmp_path):
         entrypoint="duckdb_adbc_init",
         db_kwargs=db_kwargs,
         autocommit=True,
-    ) as conn:
-        with conn.cursor() as cur:
-            cur.adbc_ingest("ingest", table, "create")
-            cur.execute("from ingest")
-            assert cur.fetch_arrow_table().to_pydict() == {
-                "fruits": ["apple", "banana", "apple", "orange", "banana", "banana"]
-            }
+    ) as conn, conn.cursor() as cur:
+        cur.adbc_ingest("ingest", table, "create")
+        cur.execute("from ingest")
+        assert cur.fetch_arrow_table().to_pydict() == {
+            "fruits": ["apple", "banana", "apple", "orange", "banana", "banana"]
+        }
 
 
 def test_ree_data(tmp_path):
@@ -358,13 +355,12 @@ def test_ree_data(tmp_path):
         entrypoint="duckdb_adbc_init",
         db_kwargs=db_kwargs,
         autocommit=True,
-    ) as conn:
-        with conn.cursor() as cur:
-            cur.adbc_ingest("ingest", table, "create")
-            cur.execute("from ingest")
-            assert cur.fetch_arrow_table().to_pydict() == {
-                "fruits": ["apple", "apple", "apple", "banana", "banana", "orange"]
-            }
+    ) as conn, conn.cursor() as cur:
+        cur.adbc_ingest("ingest", table, "create")
+        cur.execute("from ingest")
+        assert cur.fetch_arrow_table().to_pydict() == {
+            "fruits": ["apple", "apple", "apple", "banana", "banana", "orange"]
+        }
 
 
 def sorted_get_objects(catalogs):

tests/fast/api/test_connection_close.py

@@ -30,11 +30,10 @@ def test_connection_close(self, duckdb_cursor):
         check_exception(lambda: cursor.execute("select * from a"))
 
     def test_open_and_exit(self):
-        with pytest.raises(TypeError):
-            with duckdb.connect() as connection:
-                connection.execute("select 42")
-                # This exception does not get swallowed by __exit__
-                raise TypeError()
+        with pytest.raises(TypeError), duckdb.connect() as connection:
+            connection.execute("select 42")
+            # This exception does not get swallowed by __exit__
+            raise TypeError()
 
     def test_reopen_connection(self, duckdb_cursor):
         fd, db = tempfile.mkstemp()

tests/fast/api/test_with_propagating_exceptions.py

@@ -6,11 +6,10 @@
 class TestWithPropagatingExceptions:
     def test_with(self):
         # Should propagate exception raised in the 'with duckdb.connect() ..'
-        with pytest.raises(duckdb.ParserException, match="syntax error at or near *"):
-            with duckdb.connect() as con:
-                print("before")
-                con.execute("invalid")
-                print("after")
+        with pytest.raises(duckdb.ParserException, match="syntax error at or near *"), duckdb.connect() as con:
+            print("before")
+            con.execute("invalid")
+            print("after")
 
         # Does not raise an exception
         with duckdb.connect() as con:

tests/fast/arrow/test_arrow_replacement_scan.py

@@ -27,12 +27,12 @@ def test_arrow_table_replacement_scan(self, duckdb_cursor):
     )
     def test_arrow_pycapsule_replacement_scan(self, duckdb_cursor):
         tbl = pa.Table.from_pydict({"a": [1, 2, 3, 4, 5, 6, 7, 8, 9]})
-        capsule = tbl.__arrow_c_stream__()  # noqa: F841
+        capsule = tbl.__arrow_c_stream__()
 
         rel = duckdb_cursor.sql("select * from capsule")
         assert rel.fetchall() == [(i,) for i in range(1, 10)]
 
-        capsule = tbl.__arrow_c_stream__()  # noqa: F841
+        capsule = tbl.__arrow_c_stream__()
         rel = duckdb_cursor.sql("select * from capsule where a > 3 and a < 5")
         assert rel.fetchall() == [(4,)]
 
@@ -54,7 +54,7 @@ def test_arrow_pycapsule_replacement_scan(self, duckdb_cursor):
 
     def test_arrow_table_replacement_scan_view(self, duckdb_cursor):
         parquet_filename = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data", "userdata1.parquet")
-        userdata_parquet_table = pq.read_table(parquet_filename)  # noqa: F841
+        userdata_parquet_table = pq.read_table(parquet_filename)
 
         con = duckdb.connect()
 

tests/fast/test_all_types.py

@@ -589,9 +589,9 @@ def test_pandas(self, cur_type):
         warnings.simplefilter(action="ignore", category=RuntimeWarning)
         with suppress(TypeError):
             if cur_type in replacement_values:
-                dataframe = conn.execute("select " + replacement_values[cur_type]).df()  # noqa: F841
+                dataframe = conn.execute("select " + replacement_values[cur_type]).df()
             elif cur_type in adjusted_values:
-                dataframe = conn.execute(f"select {adjusted_values[cur_type]} from test_all_types()").df()  # noqa: F841
+                dataframe = conn.execute(f"select {adjusted_values[cur_type]} from test_all_types()").df()
             else:
                 dataframe = conn.execute(f'select "{cur_type}" from test_all_types()').df()  # noqa: F841
             print(cur_type)