support pybind11 and xtensor 0.27

Roy-Kid · Roy-Kid · commit 9911af22d572 · 2025-08-15T13:54:58.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ message(STATUS "xtensor-python v${${PROJECT_NAME}_VERSION}")
 # Dependencies
 # ============
 
-set(xtensor_REQUIRED_VERSION 0.26.0)
+set(xtensor_REQUIRED_VERSION 0.27.0)
 if(TARGET xtensor)
     set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
     # Note: This is not SEMVER compatible comparison
@@ -48,7 +48,7 @@ endif()
 
 find_package(Python COMPONENTS Interpreter REQUIRED)
 
-set(pybind11_REQUIRED_VERSION 2.6.1)
+set(pybind11_REQUIRED_VERSION 3.0.0)
 if (NOT TARGET pybind11::headers)
     # Defaults to ON for cmake >= 3.18
     # https://github.com/pybind/pybind11/blob/35ff42b56e9d34d9a944266eb25f2c899dbdfed7/CMakeLists.txt#L96
diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp
@@ -195,7 +195,7 @@ namespace xt
         static self_type ensure(pybind11::handle h);
         static bool check_(pybind11::handle h);
 
-#if PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3
+// #if PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3
         // Prevent ambiguous overload resolution for operators defined for
         // both xt::xcontainer_semantic and pybind11::object.
         using semantic_base::operator+=;
@@ -207,7 +207,7 @@ namespace xt
         using semantic_base::operator^=;
         // using semantic_base::operator<<=;
         // using semantic_base::operator>>=;
-#endif
+// #endif
 
     private:
 
diff --git a/include/xtensor-python/pytensor.hpp b/include/xtensor-python/pytensor.hpp
@@ -214,7 +214,7 @@ namespace xt
         static self_type ensure(pybind11::handle h);
         static bool check_(pybind11::handle h);
 
-#if PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3
+// #if PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3
         // Prevent ambiguous overload resolution for operators defined for
         // both xt::xcontainer_semantic and pybind11::object.
         using semantic_base::operator+=;
@@ -226,7 +226,7 @@ namespace xt
         using semantic_base::operator^=;
         // using semantic_base::operator<<=;
         // using semantic_base::operator>>=;
-#endif
+// #endif
 
     private:
 
