Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ from the `docs` subdirectory.

| `xtensor-python` | `xtensor` | `pybind11` |
|------------------|-----------|------------------|
| master | ^0.26.0 | >=2.6.1,<3 |
| master | ^0.26.0 | >=2.6.1,<4 |
| 0.28.0 | ^0.26.0 | >=2.6.1,<3 |
| 0.27.0 | ^0.25.0 | >=2.6.1,<3 |
| 0.26.1 | ^0.24.0 | ~2.4.3 |
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
# Host dependencies
- xtensor>=0.26,<0.27
- numpy>=2.0
- pybind11>=2.12.0,<3
- pybind11>=2.12.0,<4
# Test dependencies
- setuptools
- pytest
Expand Down
2 changes: 1 addition & 1 deletion include/xtensor-python/pycontainer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace xt

private:

#if PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3
#if (PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3) || PYBIND11_VERSION_MAJOR >= 3
// Prevent ambiguous overload resolution for operators defined for
// both xt::xcontainer and pybind11::object.
using pybind11::object::operator~;
Expand Down
Loading