From 24145ee1ff606ed7cf470bea13ef2dea77baf604 2019-12-01 17:54:11 From: Matthias Bussonnier Date: 2019-12-01 17:54:11 Subject: [PATCH] back to dev, and tools updates --- diff --git a/IPython/core/release.py b/IPython/core/release.py index a928a6b..5cf2110 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 = 7 -_version_minor = 10 -_version_patch = 1 +_version_minor = 11 +_version_patch = 0 _version_extra = '.dev' # _version_extra = 'b1' -_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/tools/release_helper.sh b/tools/release_helper.sh index bed8ed6..7f99a8a 100644 --- a/tools/release_helper.sh +++ b/tools/release_helper.sh @@ -30,9 +30,9 @@ MILESTONE=${input:-$MILESTONE} echo -n "VERSION (X.y.z) [$VERSION]:" read input VERSION=${input:-$VERSION} -echo -n "branch (master|X.y) [$branch]:" +echo -n "BRANCH (master|X.y) [$BRANCH]:" read input -branch=${input:-$branch} +BRANCH=${input:-$BRANCH} ask_section(){ echo @@ -117,7 +117,7 @@ git push origin $BRANCH echo echo "Let's tag : git tag -am \"release $VERSION\" \"$VERSION\" -s" -echo $GREEN"Press enter to wtagcommit"$NOR +echo $GREEN"Press enter to tag commit"$NOR read git tag -am "release $VERSION" "$VERSION" -s @@ -127,6 +127,22 @@ echo $GREEN"Press enter to continue"$NOR read git push origin $VERSION + +echo $GREEN"please update version number and back to .dev in ${RED}IPython/core/release.py" +echo ${BLUE}"Do not commit yet – we'll do it later."$NOR + +echo $GREEN"Press enter to continue"$NOR +read + +echo +echo "Let's commit : git commit -am \"back to dev\" -S" +echo $GREEN"Press enter to commit"$NOR +read +git commit -am "back to dev" -S + + + + echo echo $BLUE"let's : git checkout $VERSION"$NOR echo $GREEN"Press enter to continue"$NOR