mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-11 08:03:55 +00:00
Post release version bump (#4747)
* Boilerplate version number update after v2.11.0 release. * Small updates to release.rst
This commit is contained in:
parent
1a917f1852
commit
e85696e80e
@ -10,6 +10,12 @@ Changes will be added here periodically from the "Suggested changelog entry"
|
|||||||
block in pull request descriptions.
|
block in pull request descriptions.
|
||||||
|
|
||||||
|
|
||||||
|
IN DEVELOPMENT
|
||||||
|
--------------
|
||||||
|
|
||||||
|
Changes will be summarized here periodically.
|
||||||
|
|
||||||
|
|
||||||
Version 2.11.0 (July 14, 2023)
|
Version 2.11.0 (July 14, 2023)
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
|
|||||||
interface (very easy: start by clicking the link above).
|
interface (very easy: start by clicking the link above).
|
||||||
- ``git add`` and ``git commit``, ``git push``. **Ensure CI passes**. (If it
|
- ``git add`` and ``git commit``, ``git push``. **Ensure CI passes**. (If it
|
||||||
fails due to a known flake issue, either ignore or restart CI.)
|
fails due to a known flake issue, either ignore or restart CI.)
|
||||||
- Add a release branch if this is a new minor version, or update the existing release branch if it is a patch version
|
- Add a release branch if this is a new MINOR version, or update the existing release branch if it is a patch version
|
||||||
- New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
|
- New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
|
||||||
- Update branch: ``git checkout vX.Y``, ``git merge <release branch>``, ``git push``
|
- Update branch: ``git checkout vX.Y``, ``git merge <release branch>``, ``git push``
|
||||||
- Update tags (optional; if you skip this, the GitHub release makes a
|
- Update tags (optional; if you skip this, the GitHub release makes a
|
||||||
@ -50,7 +50,9 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
|
|||||||
- ``git push --tags``.
|
- ``git push --tags``.
|
||||||
- Update stable
|
- Update stable
|
||||||
- ``git checkout stable``
|
- ``git checkout stable``
|
||||||
- ``git merge master``
|
- ``git merge -X theirs vX.Y.Z``
|
||||||
|
- ``git diff vX.Y.Z``
|
||||||
|
- Carefully review and reconcile any diffs. There should be none.
|
||||||
- ``git push``
|
- ``git push``
|
||||||
- Make a GitHub release (this shows up in the UI, sends new release
|
- Make a GitHub release (this shows up in the UI, sends new release
|
||||||
notifications to users watching releases, and also uploads PyPI packages).
|
notifications to users watching releases, and also uploads PyPI packages).
|
||||||
@ -69,9 +71,10 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
|
|||||||
- Make sure you are on master, not somewhere else: ``git checkout master``
|
- Make sure you are on master, not somewhere else: ``git checkout master``
|
||||||
- Update version macros in ``include/pybind11/detail/common.h`` (set PATCH to
|
- Update version macros in ``include/pybind11/detail/common.h`` (set PATCH to
|
||||||
``0.dev1`` and increment MINOR).
|
``0.dev1`` and increment MINOR).
|
||||||
- Update ``_version.py`` to match
|
- Update ``pybind11/_version.py`` to match
|
||||||
- Run ``nox -s tests_packaging`` to ensure this was done correctly.
|
- Run ``nox -s tests_packaging`` to ensure this was done correctly.
|
||||||
- Add a spot for in-development updates in ``docs/changelog.rst``.
|
- If the release was a new MINOR version, add a new `IN DEVELOPMENT`
|
||||||
|
section in ``docs/changelog.rst``.
|
||||||
- ``git add``, ``git commit``, ``git push``
|
- ``git add``, ``git commit``, ``git push``
|
||||||
|
|
||||||
If a version branch is updated, remember to set PATCH to ``1.dev1``.
|
If a version branch is updated, remember to set PATCH to ``1.dev1``.
|
||||||
|
@ -10,12 +10,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define PYBIND11_VERSION_MAJOR 2
|
#define PYBIND11_VERSION_MAJOR 2
|
||||||
#define PYBIND11_VERSION_MINOR 11
|
#define PYBIND11_VERSION_MINOR 12
|
||||||
#define PYBIND11_VERSION_PATCH 0
|
#define PYBIND11_VERSION_PATCH 0.dev1
|
||||||
|
|
||||||
// Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html
|
// Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html
|
||||||
// Additional convention: 0xD = dev
|
// Additional convention: 0xD = dev
|
||||||
#define PYBIND11_VERSION_HEX 0x020B0000
|
#define PYBIND11_VERSION_HEX 0x020C00D1
|
||||||
|
|
||||||
// Define some generic pybind11 helper macros for warning management.
|
// Define some generic pybind11 helper macros for warning management.
|
||||||
//
|
//
|
||||||
|
@ -8,5 +8,5 @@ def _to_int(s: str) -> Union[int, str]:
|
|||||||
return s
|
return s
|
||||||
|
|
||||||
|
|
||||||
__version__ = "2.11.0"
|
__version__ = "2.12.0.dev1"
|
||||||
version_info = tuple(_to_int(s) for s in __version__.split("."))
|
version_info = tuple(_to_int(s) for s in __version__.split("."))
|
||||||
|
Loading…
Reference in New Issue
Block a user