diff --git a/docs/changelog.rst b/docs/changelog.rst index a3e671dfb..5883215c7 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -6,7 +6,12 @@ Changelog Starting with version 1.8.0, pybind11 releases use a `semantic versioning `_ policy. -v2.1.0 (not yet released) +v2.2.0 (Not yet released) +----------------------------------------------------- + +* TBD + +v2.1.0 (March 22, 2017) ----------------------------------------------------- * pybind11 now performs function overload resolution in two phases. The first diff --git a/docs/conf.py b/docs/conf.py index 82dfe262d..9f29304a2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,7 @@ master_doc = 'index' # General information about the project. project = 'pybind11' -copyright = '2016, Wenzel Jakob' +copyright = '2017, Wenzel Jakob' author = 'Wenzel Jakob' # The version info for the project you're documenting, acts as replacement for @@ -61,9 +61,9 @@ author = 'Wenzel Jakob' # built documents. # # The short X.Y version. -version = '2.1' +version = '2.2' # The full version, including alpha/beta/rc tags. -release = '2.1.dev0' +release = '2.2.dev0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/include/pybind11/common.h b/include/pybind11/common.h index 762921ca2..92b69f5dd 100644 --- a/include/pybind11/common.h +++ b/include/pybind11/common.h @@ -80,7 +80,7 @@ #endif #define PYBIND11_VERSION_MAJOR 2 -#define PYBIND11_VERSION_MINOR 1 +#define PYBIND11_VERSION_MINOR 2 #define PYBIND11_VERSION_PATCH dev0 /// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode diff --git a/pybind11/_version.py b/pybind11/_version.py index 6a75a2d26..73445e7dd 100644 --- a/pybind11/_version.py +++ b/pybind11/_version.py @@ -1,2 +1,2 @@ -version_info = (2, 1, 'dev0') +version_info = (2, 2, 'dev0') __version__ = '.'.join(map(str, version_info))