diff --git a/docs/changelog.rst b/docs/changelog.rst index 9cb07354c7e30e1f9104097bc6e7dcd2204f1221..64a0d90e3e119dd69346b9e799e0662006dfe1fb 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,7 +3,11 @@ Changelog ######### -1.2 (not yet released) +1.3 (not yet released) +-------------------------- +* TBD + +1.2 (February 7, 2016) -------------------------- * Optional: efficient generation of function signatures at compile time using C++14 @@ -34,6 +38,7 @@ Changelog * Added enum comparison and casting methods * Improved SFINAE-based detection of whether types are copy-constructible * Eliminated many warnings about unused variables and the use of ``offsetof()`` +* Support for ``std::array<>`` conversions 1.1 (December 7, 2015) -------------------------- diff --git a/docs/release.rst b/docs/release.rst index 34e40ac9d181c85fd405ac13d41ed7d7c598c053..2296225b13f437bf98fd261b6e88030ee43d8dfa 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -1,6 +1,7 @@ To release a new version of pybind11: -- Update `_version.py` (set release version, remove 'dev') +- Update version macros in `include/pybind11/common.h` +- Update `pybind11/_version.py` (set release version, remove 'dev') - `git add` and `git commit`. - `python setup.py sdist upload`. - `python setup.py bdist_wheel upload`. diff --git a/include/pybind11/common.h b/include/pybind11/common.h index 6d06c9dde24ceeee7970801d281b8a5e73bcd0a9..56aa09fcc35793dbc2bc68568508231a41e1af7e 100644 --- a/include/pybind11/common.h +++ b/include/pybind11/common.h @@ -31,7 +31,7 @@ #endif #define PYBIND11_VERSION_MAJOR 1 -#define PYBIND11_VERSION_MINOR 3 +#define PYBIND11_VERSION_MINOR 2 /// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode #if defined(_MSC_VER) diff --git a/pybind11/_version.py b/pybind11/_version.py index 15df25bb49ac7c4015318b386100b951b02a8d64..9097d9de6930050b998565fda62fb5acff5e006a 100644 --- a/pybind11/_version.py +++ b/pybind11/_version.py @@ -1,2 +1,2 @@ -version_info = (1, 2, 'dev0') +version_info = (1, 2) __version__ = '.'.join(map(str, version_info))