diff --git a/IPython/core/release.py b/IPython/core/release.py index 4967bca..ae0a537 100644 --- a/IPython/core/release.py +++ b/IPython/core/release.py @@ -20,11 +20,11 @@ name = 'ipython' # release. 'dev' as a _version_extra string means this is a development # version _version_major = 6 -_version_minor = 0 +_version_minor = 1 _version_patch = 0 _version_extra = '.dev' # _version_extra = 'rc2' -_version_extra = '' # Uncomment this for full releases +# _version_extra = '' # Uncomment this for full releases # Construct full version string from these. _ver = [_version_major, _version_minor, _version_patch] diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst new file mode 100644 index 0000000..3bdbc3e --- /dev/null +++ b/docs/source/whatsnew/development.rst @@ -0,0 +1,20 @@ +===================== + Development version +===================== + +This document describes in-flight development work. + +.. warning:: + + Please do not edit this file by hand (doing so will likely cause merge + conflicts for other Pull Requests). Instead, create a new file in the + `docs/source/whatsnew/pr` folder + + +.. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT. + + +Backwards incompatible changes +------------------------------ + +.. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT. diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst index de0300d..f13c5b4 100644 --- a/docs/source/whatsnew/index.rst +++ b/docs/source/whatsnew/index.rst @@ -20,6 +20,7 @@ development work they do here in a user friendly format. .. toctree:: :maxdepth: 1 + developement version6 github-stats-6 version5