From 36813cfa1228f9414aac669d239a0d3255fc25c3 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 3 Feb 2022 12:44:02 -0500 Subject: [PATCH] chore: back to work --- docs/changelog.rst | 6 ++++++ include/pybind11/detail/common.h | 6 +++--- pybind11/_version.py | 2 +- setup.py | 7 +++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 16bf3aa3f..63c7f41d8 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -6,6 +6,12 @@ Changelog Starting with version 1.8.0, pybind11 releases use a `semantic versioning `_ policy. +IN DEVELOPMENT +-------------- + +Changes will be added here periodically. + + Version 2.9.1 (Feb 2, 2022) --------------------------- diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h index 5c59b4141..d9f838236 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 9 -#define PYBIND11_VERSION_PATCH 1 +#define PYBIND11_VERSION_MINOR 10 +#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 0x02090100 +#define PYBIND11_VERSION_HEX 0x020A00D1 #define PYBIND11_NAMESPACE_BEGIN(name) namespace name { #define PYBIND11_NAMESPACE_END(name) } diff --git a/pybind11/_version.py b/pybind11/_version.py index 9d39b77a4..7519ac903 100644 --- a/pybind11/_version.py +++ b/pybind11/_version.py @@ -8,5 +8,5 @@ def _to_int(s): return s -__version__ = "2.9.1" +__version__ = "2.10.0.dev1" version_info = tuple(_to_int(s) for s in __version__.split(".")) diff --git a/setup.py b/setup.py index 0e7348982..f83837919 100644 --- a/setup.py +++ b/setup.py @@ -45,8 +45,11 @@ def build_expected_version_hex(matches): if serial is None: msg = 'Invalid PYBIND11_VERSION_PATCH: "{}"'.format(patch_level_serial) raise RuntimeError(msg) - return "0x{:02x}{:02x}{:02x}{}{:x}".format( - major, minor, patch, level[:1].upper(), serial + return ( + "0x" + + "{:02x}{:02x}{:02x}{}{:x}".format( + major, minor, patch, level[:1], serial + ).upper() )