fix tests

evertlammerts · evertlammerts · commit e9ca6ebc3c00 · 2025-10-09T12:04:46.000+02:00
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -79,9 +79,9 @@ jobs:
         shell: bash
         run: |
           if [[ "${{ inputs.testsuite }}" == "all" ]]; then
-            uv run coverage run -m pytest -n 4 ./tests
+            uv run coverage run -m pytest ./tests
           elif [[ "${{ inputs.testsuite }}" == "fast" ]]; then
-            uv run coverage run -m pytest -n 4 ./tests/fast
+            uv run coverage run -m pytest ./tests/fast
           else
             echo "Invalid testsuite!"
             exit 1
diff --git a/.github/workflows/packaging_sdist.yml b/.github/workflows/packaging_sdist.yml
@@ -80,7 +80,7 @@ jobs:
           # run tests
           tests_root="${{ github.workspace }}/tests"
           tests_dir="${tests_root}${{ inputs.testsuite == 'fast' && '/fast' || '/' }}"
-          uv run --verbose pytest -n 4 $tests_dir --verbose
+          uv run --verbose pytest $tests_dir --verbose
 
       - id: versioning
         run: |
diff --git a/.github/workflows/packaging_wheels.yml b/.github/workflows/packaging_wheels.yml
@@ -53,7 +53,7 @@ jobs:
         uv export --only-group test --no-emit-project  --quiet --output-file pylock.toml --directory {project} &&
         uv pip install -r pylock.toml
       CIBW_TEST_COMMAND: >
-        uv run -v pytest -n 4 ${{ inputs.testsuite == 'fast' && './tests/fast' || './tests' }} --verbose
+        uv run -v pytest ${{ inputs.testsuite == 'fast' && './tests/fast' || './tests' }} --verbose
 
     steps:
       - name: Checkout DuckDB Python
diff --git a/pyproject.toml b/pyproject.toml
@@ -305,7 +305,7 @@ dev = [ # tooling like uv will install this automatically when syncing the envir
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-addopts = "-ra -q"
+addopts = "-ra --numprocesses 4 --dist loadfile"
 testpaths = ["tests"]
 filterwarnings = [
     "error",
diff --git a/tests/fast/api/test_duckdb_connection.py b/tests/fast/api/test_duckdb_connection.py
@@ -4,7 +4,6 @@
 from conftest import ArrowPandas, NumpyPandas
 
 import duckdb
-import duckdb.typing
 
 pa = pytest.importorskip("pyarrow")
 
diff --git a/tests/fast/arrow/test_arrow_fetch_recordbatch.py b/tests/fast/arrow/test_arrow_fetch_recordbatch.py
@@ -234,7 +234,7 @@ def test_record_batch_reader_from_relation(self, duckdb_cursor):
         duckdb_cursor = duckdb.connect()
         duckdb_cursor.execute("CREATE table t as select range a from range(3000);")
         relation = duckdb_cursor.table("t")
-        record_batch_reader = relation.record_batch()
+        record_batch_reader = relation.fetch_record_batch()
         chunk = record_batch_reader.read_next_batch()
         assert len(chunk) == 3000
 
diff --git a/tests/fast/arrow/test_buffer_size_option.py b/tests/fast/arrow/test_buffer_size_option.py
@@ -1,7 +1,7 @@
 import pytest
 
 import duckdb
-from duckdb.typing import VARCHAR
+from duckdb.sqltypes import VARCHAR
 
 pa = pytest.importorskip("pyarrow")
 
@@ -13,21 +13,21 @@ def test_arrow_buffer_size(self):
         # All small string
         res = con.query("select 'bla'").fetch_arrow_table()
         assert res[0][0].type == pa.string()
-        res = con.query("select 'bla'").record_batch()
+        res = con.query("select 'bla'").fetch_record_batch()
         assert res.schema[0].type == pa.string()
 
         # All Large String
         con.execute("SET arrow_large_buffer_size=True")
         res = con.query("select 'bla'").fetch_arrow_table()
         assert res[0][0].type == pa.large_string()
-        res = con.query("select 'bla'").record_batch()
+        res = con.query("select 'bla'").fetch_record_batch()
         assert res.schema[0].type == pa.large_string()
 
         # All small string again
         con.execute("SET arrow_large_buffer_size=False")
         res = con.query("select 'bla'").fetch_arrow_table()
         assert res[0][0].type == pa.string()
-        res = con.query("select 'bla'").record_batch()
+        res = con.query("select 'bla'").fetch_record_batch()
         assert res.schema[0].type == pa.string()
 
     def test_arrow_buffer_size_udf(self):
diff --git a/tests/fast/arrow/test_timestamp_timezone.py b/tests/fast/arrow/test_timestamp_timezone.py
@@ -64,7 +64,7 @@ def test_timestamp_stream(self, duckdb_cursor):
         con.execute("create table t (i timestamptz)")
         con.execute("insert into t values (NULL),('2021-11-15 02:30:00'::timestamptz)")
         rel = con.table("t")
-        arrow_tbl = rel.record_batch().read_all()
+        arrow_tbl = rel.fetch_record_batch().read_all()
         con.register("t2", arrow_tbl)
 
         assert con.execute("select * from t").fetchall() == con.execute("select * from t2").fetchall()
diff --git a/tests/fast/test_expression.py b/tests/fast/test_expression.py
@@ -13,7 +13,7 @@
     LambdaExpression,
     StarExpression,
 )
-from duckdb.typing import INTEGER, TIMESTAMP, VARCHAR
+from duckdb.sqltypes import INTEGER, TIMESTAMP, TINYINT, VARCHAR
 from duckdb.value.constant import IntegerValue, Value
 
 pytestmark = pytest.mark.skipif(
@@ -804,7 +804,7 @@ def test_numeric_overflow(self):
         with pytest.raises(duckdb.OutOfRangeException, match="Overflow in multiplication of INT16"):
             rel2.fetchall()
 
-        val = duckdb.Value(100, duckdb.typing.TINYINT)
+        val = duckdb.Value(100, TINYINT)
         expr2 = ColumnExpression("salary") * val
         rel3 = rel.select(expr2)
         with pytest.raises(duckdb.OutOfRangeException, match="Overflow in multiplication of INT16"):
diff --git a/tests/fast/test_parquet.py b/tests/fast/test_parquet.py
@@ -3,9 +3,10 @@
 import pytest
 
 import duckdb
+import duckdb.sqltypes as duckdb_types
 
-VARCHAR = duckdb.typing.VARCHAR
-BIGINT = duckdb.typing.BIGINT
+VARCHAR = duckdb_types.VARCHAR
+BIGINT = duckdb_types.BIGINT
 
 filename = str(Path(__file__).parent / "data" / "binary_string.parquet")
 
diff --git a/tests/fast/test_relation.py b/tests/fast/test_relation.py
@@ -12,7 +12,7 @@
 
 import duckdb
 from duckdb import ColumnExpression
-from duckdb.typing import BIGINT, BOOLEAN, TINYINT, VARCHAR
+from duckdb.sqltypes import BIGINT, BOOLEAN, TINYINT, VARCHAR
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/fast/test_replacement_scan.py b/tests/fast/test_replacement_scan.py
@@ -41,11 +41,11 @@ def fetch_arrow_table(rel):
     return rel.fetch_arrow_table()
 
 
-def fetch_arrow_record_batch(rel):
+def fetch_arrow_record_batch(rel: duckdb.DuckDBPyRelation):
     # Note: this has to executed first, otherwise we'll create a deadlock
     # Because it will try to execute the input at the same time as executing the relation
     # On the same connection (that's the core of the issue)
-    return rel.execute().record_batch()
+    return rel.execute().fetch_record_batch()
 
 
 def fetch_relation(rel):
diff --git a/tests/fast/test_type.py b/tests/fast/test_type.py
@@ -4,8 +4,7 @@
 import pytest
 
 import duckdb
-import duckdb.typing
-from duckdb.typing import (
+from duckdb.sqltypes import (
     BIGINT,
     BIT,
     BLOB,
@@ -91,7 +90,7 @@ def test_incomplete_struct_type(self):
         with pytest.raises(
             duckdb.InvalidInputException, match="Could not convert empty dictionary to a duckdb STRUCT type"
         ):
-            duckdb.typing.DuckDBPyType({})
+            DuckDBPyType({})
 
     def test_map_type(self):
         type = duckdb.map_type(duckdb.sqltype("BIGINT"), duckdb.sqltype("DECIMAL(10, 2)"))
@@ -228,26 +227,26 @@ def test_hash_method(self):
     # NOTE: we can support this, but I don't think going through hoops for an outdated version of python is worth it
     @pytest.mark.skipif(sys.version_info < (3, 9), reason="python3.7 does not store Optional[..] in a recognized way")
     def test_optional(self):
-        type = duckdb.typing.DuckDBPyType(Optional[str])
+        type = DuckDBPyType(Optional[str])
         assert type == "VARCHAR"
-        type = duckdb.typing.DuckDBPyType(Optional[Union[int, bool]])
+        type = DuckDBPyType(Optional[Union[int, bool]])
         assert type == "UNION(u1 BIGINT, u2 BOOLEAN)"
-        type = duckdb.typing.DuckDBPyType(Optional[list[int]])
+        type = DuckDBPyType(Optional[list[int]])
         assert type == "BIGINT[]"
-        type = duckdb.typing.DuckDBPyType(Optional[dict[int, str]])
+        type = DuckDBPyType(Optional[dict[int, str]])
         assert type == "MAP(BIGINT, VARCHAR)"
-        type = duckdb.typing.DuckDBPyType(Optional[dict[Optional[int], Optional[str]]])
+        type = DuckDBPyType(Optional[dict[Optional[int], Optional[str]]])
         assert type == "MAP(BIGINT, VARCHAR)"
-        type = duckdb.typing.DuckDBPyType(Optional[dict[Optional[int], Optional[str]]])
+        type = DuckDBPyType(Optional[dict[Optional[int], Optional[str]]])
         assert type == "MAP(BIGINT, VARCHAR)"
-        type = duckdb.typing.DuckDBPyType(Optional[Union[Optional[str], Optional[bool]]])
+        type = DuckDBPyType(Optional[Union[Optional[str], Optional[bool]]])
         assert type == "UNION(u1 VARCHAR, u2 BOOLEAN)"
-        type = duckdb.typing.DuckDBPyType(Union[str, None])
+        type = DuckDBPyType(Union[str, None])
         assert type == "VARCHAR"
 
     @pytest.mark.skipif(sys.version_info < (3, 10), reason="'str | None' syntax requires Python 3.10 or higher")
     def test_optional_310(self):
-        type = duckdb.typing.DuckDBPyType(str | None)
+        type = DuckDBPyType(str | None)
         assert type == "VARCHAR"
 
     def test_children_attribute(self):
diff --git a/tests/fast/test_type_explicit.py b/tests/fast/test_type_explicit.py
@@ -1,4 +1,5 @@
 import duckdb
+import duckdb.sqltypes as duckdb_types
 
 
 class TestMap:
@@ -9,7 +10,7 @@ def test_array_list_tuple_ambiguity(self):
 
         # By using an explicit duckdb.Value with an array type, we should convert the input as an array
         # and get an array (tuple) back
-        typ = duckdb.array_type(duckdb.typing.BIGINT, 2)
+        typ = duckdb.array_type(duckdb_types.BIGINT, 2)
         val = duckdb.Value((1, 2), typ)
         res = con.sql("SELECT $arg", params={"arg": val}).fetchall()[0][0]
         assert res == (1, 2)
diff --git a/tests/fast/test_value.py b/tests/fast/test_value.py
@@ -6,7 +6,7 @@
 
 import duckdb
 from duckdb import InvalidInputException, NotImplementedException
-from duckdb.typing import (
+from duckdb.sqltypes import (
     BIGINT,
     BIT,
     BLOB,
diff --git a/tests/fast/udf/test_null_filtering.py b/tests/fast/udf/test_null_filtering.py
@@ -5,7 +5,7 @@
 import pytest
 
 import duckdb
-from duckdb.typing import (
+from duckdb.sqltypes import (
     BIGINT,
     BLOB,
     BOOLEAN,
@@ -24,14 +24,15 @@
     UTINYINT,
     UUID,
     VARCHAR,
+    DuckDBPyType,
 )
 
 pd = pytest.importorskip("pandas")
 pa = pytest.importorskip("pyarrow", "18.0.0")
 
 
 class Candidate(NamedTuple):
-    type: duckdb.typing.DuckDBPyType
+    type: DuckDBPyType
     variant_one: Any
     variant_two: Any
 
diff --git a/tests/fast/udf/test_remove_function.py b/tests/fast/udf/test_remove_function.py
@@ -1,7 +1,7 @@
 import pytest
 
 import duckdb
-from duckdb.typing import BIGINT, VARCHAR
+from duckdb.sqltypes import BIGINT, VARCHAR
 
 pd = pytest.importorskip("pandas")
 pa = pytest.importorskip("pyarrow")
diff --git a/tests/fast/udf/test_scalar.py b/tests/fast/udf/test_scalar.py
@@ -7,7 +7,7 @@
 import pytest
 
 import duckdb
-from duckdb.typing import (
+from duckdb.sqltypes import (
     BIGINT,
     BLOB,
     BOOLEAN,
diff --git a/tests/fast/udf/test_scalar_arrow.py b/tests/fast/udf/test_scalar_arrow.py
@@ -1,7 +1,7 @@
 import pytest
 
 import duckdb
-from duckdb.typing import BIGINT, INTEGER, VARCHAR
+from duckdb.sqltypes import BIGINT, INTEGER, VARCHAR
 
 pd = pytest.importorskip("pandas")
 pa = pytest.importorskip("pyarrow")
diff --git a/tests/fast/udf/test_scalar_native.py b/tests/fast/udf/test_scalar_native.py
@@ -1,7 +1,7 @@
 import pytest
 
 import duckdb
-from duckdb.typing import (
+from duckdb.sqltypes import (
     BIGINT,
     HUGEINT,
     INTEGER,
diff --git a/tests/pytest.ini b/tests/pytest.ini
