bulk cleanup

Author: evertlammerts

CMakeLists.txt

@@ -111,7 +111,6 @@ nanobind_add_module(
   $<TARGET_OBJECTS:python_native>
   $<TARGET_OBJECTS:python_numpy>
   $<TARGET_OBJECTS:python_pandas>
-  $<TARGET_OBJECTS:python_pybind11>
   $<TARGET_OBJECTS:python_connection>
   $<TARGET_OBJECTS:python_expression>
   $<TARGET_OBJECTS:python_relation>

src/CMakeLists.txt

@@ -1,7 +1,6 @@
 # this is used for clang-tidy checks
 add_subdirectory(pyrelation)
 add_subdirectory(pyexpression)
-add_subdirectory(pybind11)
 add_subdirectory(numpy)
 add_subdirectory(native)
 add_subdirectory(jupyter)
@@ -25,6 +24,7 @@ add_library(
   pyrelation.cpp
   pyresult.cpp
   pystatement.cpp
+  pyutil.cpp
   python_dependency.cpp
   python_import_cache.cpp
   python_replacement_scan.cpp

src/common/exceptions.cpp

@@ -1,10 +1,10 @@
-#include "duckdb_python/pybind11/exceptions.hpp"
+#include "duckdb_python/exceptions.hpp"
 
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/exception/list.hpp"
 #include "duckdb/common/error_data.hpp"
 #include "duckdb/common/string_util.hpp"
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 namespace nb = nanobind;
 

src/dataframe.cpp

@@ -1,4 +1,4 @@
-#include "duckdb_python/pybind11/dataframe.hpp"
+#include "duckdb_python/dataframe.hpp"
 #include "duckdb_python/pyconnection/pyconnection.hpp"
 
 namespace duckdb {

src/duckdb_python.cpp

@@ -1,4 +1,4 @@
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 #include "duckdb/common/atomic.hpp"
 #include "duckdb/common/vector.hpp"
@@ -9,14 +9,14 @@
 #include "duckdb_python/pystatement.hpp"
 #include "duckdb_python/pyrelation.hpp"
 #include "duckdb_python/expression/pyexpression.hpp"
-#include "duckdb_python/pybind11/exceptions.hpp"
+#include "duckdb_python/exceptions.hpp"
 #include "duckdb_python/typing.hpp"
 #include "duckdb_python/functional.hpp"
 #include "duckdb/common/box_renderer.hpp"
 #include "duckdb/function/function.hpp"
-#include "duckdb_python/pybind11/conversions/exception_handling_enum.hpp"
-#include "duckdb_python/pybind11/conversions/python_udf_type_enum.hpp"
-#include "duckdb_python/pybind11/conversions/python_csv_line_terminator_enum.hpp"
+#include "duckdb_python/nb/conversions/exception_handling_enum.hpp"
+#include "duckdb_python/nb/conversions/python_udf_type_enum.hpp"
+#include "duckdb_python/nb/conversions/python_csv_line_terminator_enum.hpp"
 #include "duckdb/common/enums/statement_type.hpp"
 #include "duckdb/common/adbc/adbc-init.hpp"
 

src/include/duckdb_python/arrow/arrow_array_stream.hpp

@@ -15,7 +15,7 @@
 #include "duckdb/function/table/arrow.hpp"
 #include "duckdb/main/client_config.hpp"
 #include "duckdb/main/config.hpp"
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 #include "duckdb/common/string.hpp"
 #include "duckdb/common/vector.hpp"

src/include/duckdb_python/arrow/arrow_export_utils.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 namespace duckdb {
 

src/include/duckdb_python/arrow/filter_pushdown_visitor.hpp

@@ -12,7 +12,7 @@
 #include "duckdb/function/table/arrow/arrow_duck_schema.hpp"
 #include "duckdb/planner/expression.hpp"
 #include "duckdb/planner/table_filter.hpp"
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 namespace duckdb {
 

src/include/duckdb_python/arrow/polars_filter_pushdown.hpp

@@ -10,7 +10,7 @@
 
 #include "duckdb/planner/table_filter_set.hpp"
 #include "duckdb/main/client_properties.hpp"
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 namespace duckdb {
 

src/include/duckdb_python/arrow/pyarrow_filter_pushdown.hpp

@@ -11,7 +11,7 @@
 #include "duckdb/function/table/arrow/arrow_duck_schema.hpp"
 #include "duckdb/planner/table_filter_set.hpp"
 #include "duckdb/main/client_properties.hpp"
-#include "duckdb_python/pybind11/pybind_wrapper.hpp"
+#include "duckdb_python/nb/casters.hpp"
 
 namespace duckdb {