mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 23:22:01 +00:00
Merge branch 'master' into smart_holder
This commit is contained in:
commit
02dc01b536
@ -6,8 +6,8 @@ Changelog
|
|||||||
Starting with version 1.8.0, pybind11 releases use a `semantic versioning
|
Starting with version 1.8.0, pybind11 releases use a `semantic versioning
|
||||||
<http://semver.org>`_ policy.
|
<http://semver.org>`_ policy.
|
||||||
|
|
||||||
v2.7.0 (TBA, not yet released)
|
v2.7.0 (Jul 16, 2021)
|
||||||
------------------------------
|
---------------------
|
||||||
|
|
||||||
New features:
|
New features:
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ To release a new version of pybind11:
|
|||||||
name like "Version X.Y.Z", and optionally copy-and-paste the changelog into
|
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
|
the description (processed as markdown by Pandoc). Check "pre-release" if
|
||||||
this is a beta/RC. You can get partway there with
|
this is a beta/RC. You can get partway there with
|
||||||
``cat docs/changelog.rst | pandsoc -f rst -t markdown``.
|
``cat docs/changelog.rst | pandoc -f rst -t markdown``.
|
||||||
- CLI method: with ``gh`` installed, run ``gh release create vX.Y.Z -t "Version X.Y.Z"``
|
- 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``.
|
If this is a pre-release, add ``-p``.
|
||||||
|
|
||||||
|
@ -10,12 +10,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define PYBIND11_VERSION_MAJOR 2
|
#define PYBIND11_VERSION_MAJOR 2
|
||||||
#define PYBIND11_VERSION_MINOR 6
|
#define PYBIND11_VERSION_MINOR 7
|
||||||
#define PYBIND11_VERSION_PATCH 3.dev1
|
#define PYBIND11_VERSION_PATCH 0
|
||||||
|
|
||||||
// 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 0x020603D1
|
#define PYBIND11_VERSION_HEX 0x02070000
|
||||||
|
|
||||||
#define PYBIND11_NAMESPACE_BEGIN(name) namespace name {
|
#define PYBIND11_NAMESPACE_BEGIN(name) namespace name {
|
||||||
#define PYBIND11_NAMESPACE_END(name) }
|
#define PYBIND11_NAMESPACE_END(name) }
|
||||||
|
@ -8,5 +8,5 @@ def _to_int(s):
|
|||||||
return s
|
return s
|
||||||
|
|
||||||
|
|
||||||
__version__ = "2.6.3.dev1"
|
__version__ = "2.7.0"
|
||||||
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