From 8d82f298871c8222a922d0c8992a200012750659 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 15 Jul 2022 21:40:33 -0500 Subject: [PATCH 1/3] chore: back to work Signed-off-by: Henry Schreiner --- docs/changelog.rst | 7 +++++++ include/pybind11/detail/common.h | 6 +++--- pybind11/_version.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index b926b27af..9c8ff423f 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -9,6 +9,13 @@ Starting with version 1.8.0, pybind11 releases use a `semantic versioning Changes will be added here periodically from the "Suggested changelog entry" block in pull request descriptions. + + +IN DEVELOPMENT +-------------- + +Changes will be summarized here periodically. + Version 2.10.0 (Jul 15, 2022) ----------------------------- diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h index 1da323f31..05370108f 100644 --- a/include/pybind11/detail/common.h +++ b/include/pybind11/detail/common.h @@ -10,12 +10,12 @@ #pragma once #define PYBIND11_VERSION_MAJOR 2 -#define PYBIND11_VERSION_MINOR 10 -#define PYBIND11_VERSION_PATCH 0 +#define PYBIND11_VERSION_MINOR 11 +#define PYBIND11_VERSION_PATCH 0.dev1 // Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html // Additional convention: 0xD = dev -#define PYBIND11_VERSION_HEX 0x020A0000 +#define PYBIND11_VERSION_HEX 0x020B00D1 #define PYBIND11_NAMESPACE_BEGIN(name) namespace name { #define PYBIND11_NAMESPACE_END(name) } diff --git a/pybind11/_version.py b/pybind11/_version.py index b78d5963d..1cb51fc5c 100644 --- a/pybind11/_version.py +++ b/pybind11/_version.py @@ -8,5 +8,5 @@ def _to_int(s: str) -> Union[int, str]: return s -__version__ = "2.10.0" +__version__ = "2.11.0.dev1" version_info = tuple(_to_int(s) for s in __version__.split(".")) From 5116a629e9819aeb6d142e7d94c1feb365adae98 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 15 Jul 2022 21:03:51 -0500 Subject: [PATCH 2/3] fix(spelling): PYTHON_VERSIONS --- noxfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index fe36d70fe..2639cdd3a 100644 --- a/noxfile.py +++ b/noxfile.py @@ -5,7 +5,7 @@ import nox nox.needs_version = ">=2022.1.7" nox.options.sessions = ["lint", "tests", "tests_packaging"] -PYTHON_VERISONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8"] +PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8"] if os.environ.get("CI", None): nox.options.error_on_missing_interpreters = True @@ -20,7 +20,7 @@ def lint(session: nox.Session) -> None: session.run("pre-commit", "run", "-a") -@nox.session(python=PYTHON_VERISONS) +@nox.session(python=PYTHON_VERSIONS) def tests(session: nox.Session) -> None: """ Run the tests (requires a compiler). From 59f03ee389c283cde65bd800c8f32ea690daf3fd Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 15 Jul 2022 21:43:27 -0500 Subject: [PATCH 3/3] tests: include pypy3.9 in nox if present Signed-off-by: Henry Schreiner --- noxfile.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 2639cdd3a..7be1f2544 100644 --- a/noxfile.py +++ b/noxfile.py @@ -5,7 +5,17 @@ import nox nox.needs_version = ">=2022.1.7" nox.options.sessions = ["lint", "tests", "tests_packaging"] -PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8"] +PYTHON_VERSIONS = [ + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "pypy3.7", + "pypy3.8", + "pypy3.9", +] if os.environ.get("CI", None): nox.options.error_on_missing_interpreters = True