release-cookbook: don't change the egg version in stack/slapos.cfg

We prefer to change the egg version at a different time (usually inside
a MR containing other changes).

release-cookbook

@@ -22,37 +22,22 @@ CURRENT_EGG_VERSION=`cat setup.py | grep ^version | cut -d\' -f2`
 sed -i "s/$CURRENT_EGG_VERSION/$NEXT_VERSION/g" setup.py
 git commit -m "Release slapos.cookbook ($NEXT_VERSION)" setup.py
 
-if [ ! $EGG_ONLY == "Y" ];
-then
-  sed -i "s/slapos.cookbook = $CURRENT_EGG_VERSION/slapos.cookbook = $NEXT_VERSION/g" stack/slapos.cfg
-  sed -i "s/slapos.cookbook==$CURRENT_EGG_VERSION/slapos.cookbook==$NEXT_VERSION/g" stack/slapos.cfg
-  git commit -m "stack/slapos: slapos.cookbook version up ($NEXT_VERSION)" stack/slapos.cfg
-fi
-
 echo "############### Merging into 1.0 and generating the tag ################"
 git checkout 1.0
-git reset --hard origin/1.0 
+git reset --hard origin/1.0
 git clean -f
 git merge master -m "Update Release Candidate"
-
-# Revert changes from master
-git diff HEAD..master | git apply 
-
-# Download patch to update revisions based on tests
-wget -O update-release.sh https://nexedi.erp5.net/portal_skins/custom/TestResultModule_getReleaseCandidateRevision 
-bash update-release.sh
-git commit -m 'Update git revisions' -a  
 git tag $NEXT_VERSION -m "Release $NEXT_VERSION"
 
 echo "############### Building sdist  ################"
-python setup.py sdist
+python3 setup.py sdist
 
 
 echo "###################################################################"
 echo "You are about to release a new tag, a new version of slapos.cookbook"
 echo " and a new version of SlapOS Software Release"
 echo ""
-echo "Lastest release: $CURRENT_VERSION"
+echo "Latest release: $CURRENT_VERSION"
 echo "Next Release to be Tagged: $NEXT_VERSION"
 echo "Current slapos.cookbook version: $CURRENT_EGG_VERSION"
 echo "Next slapos.cookbook to be released: $NEXT_VERSION"
@@ -70,15 +55,15 @@ echo " To review $NEXT_VERSION use :: git log $NEXT_VERSION"
 echo " To review individual commits :: git show HASH"
 echo ""
 echo ""
-echo "Once everything is ok, please upload slapos.cookbook egg /!\\ BEFORE /!\\" 
-echo "push your changes into the repository. Please use twine for it."
+echo "Once everything is ok, please upload slapos.cookbook egg to pypi."
+echo "Please use twine for it."
 echo ""
 echo "To upload :: python -m twine upload dist/slapos.cookbook-$NEXT_VERSION*"
 echo "To verify if upload succeed access: https://pypi.org/project/slapos.cookbook/$NEXT_VERSION/"
 echo ""
 echo " More info on twine: https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives"
 echo ""
-echo "Once egg is updated please push your changes into main repository:"
+echo "Also push your changes into upstream repository:"
 echo ""
 echo " git push origin master 1.0 $NEXT_VERSION"
 echo ""