Skip to content

Commit 2f59002

Browse files
authored
Upgraded to pybind11 3 (#325)
1 parent afc1672 commit 2f59002

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ from the `docs` subdirectory.
204204

205205
| `xtensor-python` | `xtensor` | `pybind11` |
206206
|------------------|-----------|------------------|
207-
| master | ^0.26.0 | >=2.6.1,<3 |
207+
| master | ^0.26.0 | >=2.6.1,<4 |
208208
| 0.28.0 | ^0.26.0 | >=2.6.1,<3 |
209209
| 0.27.0 | ^0.25.0 | >=2.6.1,<3 |
210210
| 0.26.1 | ^0.24.0 | ~2.4.3 |

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
# Host dependencies
99
- xtensor>=0.26,<0.27
1010
- numpy>=2.0
11-
- pybind11>=2.12.0,<3
11+
- pybind11>=2.12.0,<4
1212
# Test dependencies
1313
- setuptools
1414
- pytest

include/xtensor-python/pycontainer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ namespace xt
129129

130130
private:
131131

132-
#if PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3
132+
#if (PYBIND11_VERSION_MAJOR == 2 && PYBIND11_VERSION_MINOR >= 3) || PYBIND11_VERSION_MAJOR >= 3
133133
// Prevent ambiguous overload resolution for operators defined for
134134
// both xt::xcontainer and pybind11::object.
135135
using pybind11::object::operator~;

0 commit comments

Comments
 (0)