From 8de7772cc72daca8e947b79b83fea46214931604 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 26 Jan 2021 21:26:45 -0500 Subject: [PATCH] chore: prepare for the 2.6.2 release (#2821) --- docs/changelog.rst | 36 ++++++++++++++++---------------- docs/release.rst | 3 ++- include/pybind11/detail/common.h | 2 +- pybind11/_version.py | 2 +- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 0fdada9f5f..157b2960a6 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,7 +10,6 @@ Starting with version 1.8.0, pybind11 releases use a `semantic versioning v2.6.2 (Jan 26, 2021) --------------------- - Minor missing functionality added: * enum: add missing Enum.value property. @@ -20,6 +19,20 @@ Minor missing functionality added: ``.disarm`` for ``gil_scoped_acquire``/``gil_scoped_release``. `#2657 `_ +Fixed or improved behavior in a few special cases: + +* Fix bug where the constructor of ``object`` subclasses would not throw on + being passed a Python object of the wrong type. + `#2701 `_ + +* The ``type_caster`` for integers does not convert Python objects with + ``__int__`` anymore with ``noconvert`` or during the first round of trying + overloads. + `#2698 `_ + +* When casting to a C++ integer, ``__index__`` is always called and not + considered as conversion, consistent with Python 3.8+. + `#2801 `_ Build improvements: @@ -53,23 +66,6 @@ Build improvements: Bug fixes: -* Fix invalid access when calling a pybind11 ``__init__`` on a non-pybind11 - class instance. - `#2755 `_ - -* The ``type_caster`` for integers does not convert Python objects with - ``__int__`` anymore with ``noconvert`` or during the first round of trying - overloads. - `#2698 `_ - -* When casting to a C++ integer, ``__index__`` is always called and not - considered as conversion, consistent with Python 3.8+. - `#2801 `_ - -* Fix bug where the constructor of ``object`` subclasses would not throw on - being passed a Python object of the wrong type. - `#2701 `_ - * Fixed segfault in multithreaded environments when using ``scoped_ostream_redirect``. `#2675 `_ @@ -105,6 +101,10 @@ Warning fixes: Valgrind work: +* Fix invalid access when calling a pybind11 ``__init__`` on a non-pybind11 + class instance. + `#2755 `_ + * Fixed various minor memory leaks in pybind11's test suite. `#2758 `_ diff --git a/docs/release.rst b/docs/release.rst index 80ec713664..9dbff03838 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -52,7 +52,8 @@ To release a new version of pybind11: name (if you didn't tag above, it will be made here), fill in a release name like "Version X.Y.Z", and optionally copy-and-paste the changelog into the description (processed as markdown by Pandoc). Check "pre-release" if - this is a beta/RC. + this is a beta/RC. You can get partway there with + ``cat docs/changelog.rst | pandsoc -f rst -t markdown``. - CLI method: with ``gh`` installed, run ``gh release create vX.Y.Z -t "Version X.Y.Z"`` If this is a pre-release, add ``-p``. diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h index 950bd378cd..de495e4f9e 100644 --- a/include/pybind11/detail/common.h +++ b/include/pybind11/detail/common.h @@ -11,7 +11,7 @@ #define PYBIND11_VERSION_MAJOR 2 #define PYBIND11_VERSION_MINOR 6 -#define PYBIND11_VERSION_PATCH 2.dev1 +#define PYBIND11_VERSION_PATCH 2 #define PYBIND11_NAMESPACE_BEGIN(name) namespace name { #define PYBIND11_NAMESPACE_END(name) } diff --git a/pybind11/_version.py b/pybind11/_version.py index abfb85ef95..f8b795eebc 100644 --- a/pybind11/_version.py +++ b/pybind11/_version.py @@ -8,5 +8,5 @@ def _to_int(s): return s -__version__ = "2.6.2.dev1" +__version__ = "2.6.2" version_info = tuple(_to_int(s) for s in __version__.split("."))