Skip to content

Commit 1df8049

Browse files
franzpoeschelrwgk
andauthored
Update Pybind to 2.11.1 (#1489)
* Update Pybind to 2.11.1 * Document version change --------- Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
1 parent b1d9ce9 commit 1df8049

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2426
-1194
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Changes to "0.15.0"
1717
Features
1818
""""""""
1919

20+
- pybind11: require version 2.11.1+ #1220 #1322
21+
2022
Bug Fixes
2123
"""""""""
2224

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ if(openPMD_USE_PYTHON STREQUAL AUTO)
402402
if(openPMD_USE_INTERNAL_PYBIND11)
403403
add_subdirectory("${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/pybind11")
404404
set(openPMD_HAVE_PYTHON TRUE)
405-
message(STATUS "pybind11: Using INTERNAL version 2.10.1")
405+
message(STATUS "pybind11: Using INTERNAL version 2.11.1")
406406
else()
407-
find_package(pybind11 2.10.1 CONFIG)
407+
find_package(pybind11 2.11.1 CONFIG)
408408
if(pybind11_FOUND)
409409
set(openPMD_HAVE_PYTHON TRUE)
410410
message(STATUS "pybind11: Found version '${pybind11_VERSION}'")
@@ -420,9 +420,9 @@ elseif(openPMD_USE_PYTHON)
420420
if(openPMD_USE_INTERNAL_PYBIND11)
421421
add_subdirectory("${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/pybind11")
422422
set(openPMD_HAVE_PYTHON TRUE)
423-
message(STATUS "pybind11: Using INTERNAL version 2.10.1")
423+
message(STATUS "pybind11: Using INTERNAL version 2.11.1")
424424
else()
425-
find_package(pybind11 2.10.1 REQUIRED CONFIG)
425+
find_package(pybind11 2.11.1 REQUIRED CONFIG)
426426
set(openPMD_HAVE_PYTHON TRUE)
427427
message(STATUS "pybind11: Found version '${pybind11_VERSION}'")
428428
endif()

NEWS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Please transition to ADIOS2.
1313
For reading legacy ADIOS1 BP3 files, either use an older version of openPMD-api or the BP3 backend in ADIOS2.
1414
Note that ADIOS2 does not support compression in BP3 files.
1515

16+
pybind11 2.11.1 is now the minimally supported version for Python support.
17+
1618

1719
0.15.0
1820
------

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ C++ & Python API for Scientific I/O with openPMD
77
[![Gitter chat](https://img.shields.io/gitter/room/openPMD/API)](https://gitter.im/openPMD/API)
88
![Supported Platforms][api-platforms]
99
[![License](https://img.shields.io/badge/license-LGPLv3-blue)](https://www.gnu.org/licenses/lgpl-3.0.html)
10-
[![DOI](https://rodare.hzdr.de/badge/DOI/10.14278/rodare.27.svg)](https://doi.org/10.14278/rodare.27)
10+
[![DOI](https://rodare.hzdr.de/badge/DOI/10.14278/rodare.27.svg)](https://doi.org/10.14278/rodare.27)
1111
[![CodeFactor](https://www.codefactor.io/repository/github/openpmd/openpmd-api/badge)](https://www.codefactor.io/repository/github/openpmd/openpmd-api)
12-
[![Coverage Status](https://coveralls.io/repos/github/openPMD/openPMD-api/badge)](https://coveralls.io/github/openPMD/openPMD-api)
12+
[![Coverage Status](https://coveralls.io/repos/github/openPMD/openPMD-api/badge)](https://coveralls.io/github/openPMD/openPMD-api)
1313
[![Documentation Status](https://readthedocs.org/projects/openpmd-api/badge/?version=latest)](https://openpmd-api.readthedocs.io/en/latest/?badge=latest)
1414
[![Linux/OSX Build Status dev](https://travis-ci.com/openPMD/openPMD-api.svg?branch=dev)](https://travis-ci.com/openPMD/openPMD-api)
1515
[![Windows Build Status dev](https://ci.appveyor.com/api/projects/status/x95q4n620pqk0e0t/branch/dev?svg=true)](https://ci.appveyor.com/project/ax3l/openpmd-api/branch/dev)
@@ -101,7 +101,7 @@ Required:
101101

102102
Shipped internally in `share/openPMD/thirdParty/`:
103103
* [Catch2](https://github.com/catchorg/Catch2) 2.13.10+ ([BSL-1.0](https://github.com/catchorg/Catch2/blob/master/LICENSE.txt))
104-
* [pybind11](https://github.com/pybind/pybind11) 2.10.1+ ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE))
104+
* [pybind11](https://github.com/pybind/pybind11) 2.11.1+ ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE))
105105
* [NLohmann-JSON](https://github.com/nlohmann/json) 3.9.1+ ([MIT](https://github.com/nlohmann/json/blob/develop/LICENSE.MIT))
106106
* [toml11](https://github.com/ToruNiina/toml11) 3.7.1+ ([MIT](https://github.com/ToruNiina/toml11/blob/master/LICENSE))
107107

@@ -116,7 +116,7 @@ while those can be built either with or without:
116116
Optional language bindings:
117117
* Python:
118118
* Python 3.7 - 3.11
119-
* pybind11 2.10.1+
119+
* pybind11 2.11.1+
120120
* numpy 1.15+
121121
* mpi4py 2.1+ (optional, for MPI)
122122
* pandas 1.0+ (optional, for dataframes)
@@ -267,7 +267,7 @@ The following options allow to switch to external installs:
267267
| CMake Option | Values | Library | Version |
268268
|---------------------------------|------------|---------------|----------|
269269
| `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.13.10+ |
270-
| `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11 | 2.10.1+ |
270+
| `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11 | 2.11.1+ |
271271
| `openPMD_USE_INTERNAL_JSON` | **ON**/OFF | NLohmann-JSON | 3.9.1+ |
272272
| `openPMD_USE_INTERNAL_TOML11` | **ON**/OFF | toml11 | 3.7.1+ |
273273

docs/source/dev/buildoptions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The following options allow to switch to external installs of dependencies:
6767
CMake Option Values Installs Library Version
6868
================================= =========== ======== ============= ========
6969
``openPMD_USE_INTERNAL_CATCH`` **ON**/OFF No Catch2 2.13.10+
70-
``openPMD_USE_INTERNAL_PYBIND11`` **ON**/OFF No pybind11 2.10.1+
70+
``openPMD_USE_INTERNAL_PYBIND11`` **ON**/OFF No pybind11 2.11.1+
7171
``openPMD_USE_INTERNAL_JSON`` **ON**/OFF No NLohmann-JSON 3.9.1+
7272
``openPMD_USE_INTERNAL_TOML11`` **ON**/OFF No toml11 3.7.1+
7373
================================= =========== ======== ============= ========

docs/source/dev/dependencies.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Shipped internally
1818
The following libraries are shipped internally in ``share/openPMD/thirdParty/`` for convenience:
1919

2020
* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.13.10+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`__)
21-
* `pybind11 <https://github.com/pybind/pybind11>`_ 2.10.1+ (`new BSD <https://github.com/pybind/pybind11/blob/master/LICENSE>`_)
21+
* `pybind11 <https://github.com/pybind/pybind11>`_ 2.11.1+ (`new BSD <https://github.com/pybind/pybind11/blob/master/LICENSE>`_)
2222
* `NLohmann-JSON <https://github.com/nlohmann/json>`_ 3.9.1+ (`MIT <https://github.com/nlohmann/json/blob/develop/LICENSE.MIT>`_)
2323
* `toml11 <https://github.com/ToruNiina/toml11>`_ 3.7.1+ (`MIT <https://github.com/ToruNiina/toml11/blob/master/LICENSE>`__)
2424

@@ -40,7 +40,7 @@ Optional: language bindings
4040
* Python:
4141

4242
* Python 3.7 - 3.11
43-
* pybind11 2.10.1+
43+
* pybind11 2.11.1+
4444
* numpy 1.15+
4545
* mpi4py 2.1+ (optional, for MPI)
4646
* pandas 1.0+ (optional, for dataframes)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ requires = [
33
"setuptools>=42",
44
"wheel",
55
"cmake>=3.15.0,<4.0.0",
6-
"pybind11>=2.10.1,<3.0.0"
6+
"pybind11>=2.11.1,<3.0.0"
77
]
88
build-backend = "setuptools.build_meta"

share/openPMD/thirdParty/pybind11/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
# All rights reserved. Use of this source code is governed by a
66
# BSD-style license that can be found in the LICENSE file.
77

8-
cmake_minimum_required(VERSION 3.4)
8+
cmake_minimum_required(VERSION 3.5)
99

10-
# The `cmake_minimum_required(VERSION 3.4...3.22)` syntax does not work with
10+
# The `cmake_minimum_required(VERSION 3.5...3.26)` syntax does not work with
1111
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
1212
# the behavior using the following workaround:
13-
if(${CMAKE_VERSION} VERSION_LESS 3.22)
13+
if(${CMAKE_VERSION} VERSION_LESS 3.26)
1414
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
1515
else()
16-
cmake_policy(VERSION 3.22)
16+
cmake_policy(VERSION 3.26)
1717
endif()
1818

1919
# Avoid infinite recursion if tests include this as a subdirectory
@@ -126,6 +126,9 @@ set(PYBIND11_HEADERS
126126
include/pybind11/complex.h
127127
include/pybind11/options.h
128128
include/pybind11/eigen.h
129+
include/pybind11/eigen/common.h
130+
include/pybind11/eigen/matrix.h
131+
include/pybind11/eigen/tensor.h
129132
include/pybind11/embed.h
130133
include/pybind11/eval.h
131134
include/pybind11/gil.h
@@ -137,7 +140,8 @@ set(PYBIND11_HEADERS
137140
include/pybind11/pytypes.h
138141
include/pybind11/stl.h
139142
include/pybind11/stl_bind.h
140-
include/pybind11/stl/filesystem.h)
143+
include/pybind11/stl/filesystem.h
144+
include/pybind11/type_caster_pyobject_ptr.h)
141145

142146
# Compare with grep and warn if mismatched
143147
if(PYBIND11_MASTER_PROJECT AND NOT CMAKE_VERSION VERSION_LESS 3.12)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
prune tests
12
recursive-include pybind11/include/pybind11 *.h
23
recursive-include pybind11 *.py
34
recursive-include pybind11 py.typed
45
include pybind11/share/cmake/pybind11/*.cmake
5-
include LICENSE README.rst pyproject.toml setup.py setup.cfg
6+
include LICENSE README.rst SECURITY.md pyproject.toml setup.py setup.cfg

share/openPMD/thirdParty/pybind11/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ This project was created by `Wenzel
135135
Jakob <http://rgl.epfl.ch/people/wjakob>`_. Significant features and/or
136136
improvements to the code were contributed by Jonas Adler, Lori A. Burns,
137137
Sylvain Corlay, Eric Cousineau, Aaron Gokaslan, Ralf Grosse-Kunstleve, Trent Houliston, Axel
138-
Huebl, @hulucc, Yannick Jadoul, Sergey Lyskov Johan Mabille, Tomasz Miąsko,
138+
Huebl, @hulucc, Yannick Jadoul, Sergey Lyskov, Johan Mabille, Tomasz Miąsko,
139139
Dean Moldovan, Ben Pritchard, Jason Rhinelander, Boris Schäling, Pim
140140
Schellart, Henry Schreiner, Ivan Smirnov, Boris Staletic, and Patrick Stewart.
141141

0 commit comments

Comments
 (0)