Merge branch 'master' into smart_holder

docs/changelog.rst

@@ -6,8 +6,8 @@ Changelog
 Starting with version 1.8.0, pybind11 releases use a `semantic versioning
 <http://semver.org>`_ policy.
 
-v2.7.0 (TBA, not yet released)
-------------------------------
+v2.7.0 (Jul 16, 2021)
+---------------------
 
 New features:
 

docs/release.rst

@@ -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
     the description (processed as markdown by Pandoc). Check "pre-release" if
     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"``
     If this is a pre-release, add ``-p``.
 

include/pybind11/detail/common.h

@@ -10,12 +10,12 @@
 #pragma once
 
 #define PYBIND11_VERSION_MAJOR 2
-#define PYBIND11_VERSION_MINOR 6
-#define PYBIND11_VERSION_PATCH 3.dev1
+#define PYBIND11_VERSION_MINOR 7
+#define PYBIND11_VERSION_PATCH 0
 
 // Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html
 // Additional convention: 0xD = dev
-#define PYBIND11_VERSION_HEX 0x020603D1
+#define PYBIND11_VERSION_HEX 0x02070000
 
 #define PYBIND11_NAMESPACE_BEGIN(name) namespace name {
 #define PYBIND11_NAMESPACE_END(name) }

pybind11/_version.py

@@ -8,5 +8,5 @@ def _to_int(s):
         return s
 
 
-__version__ = "2.6.3.dev1"
+__version__ = "2.7.0"
 version_info = tuple(_to_int(s) for s in __version__.split("."))