From 30bbff96271f289dab1259ff2ed2bdb04aa518d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Sat, 8 Feb 2014 11:13:51 -0800 Subject: [PATCH] Updated Scrapy release procedure (markdown) --- Scrapy-release-procedure.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Scrapy-release-procedure.md b/Scrapy-release-procedure.md index c1864eb..bd2d4e8 100644 --- a/Scrapy-release-procedure.md +++ b/Scrapy-release-procedure.md @@ -43,31 +43,31 @@ $ git push origin master --tags * [Scrapy blog](http://blog.scrapy.org) (Posterous autoposts to Twitter) * [scrapy-users group](http://groups.google.com/group/scrapy-users) * change `#scrapy` IRC channel topic: - * `/msg ChanServ topic #scrapy Scrapy 0.XX released! http://scrapy.org/download/` + * `/msg ChanServ topic Welcome to Scrapy - Say "Hi!" and ask. Latest stable release is Scrapy 0.22.2 ## Micro/bugfix releases -Assuming we are releasing `0.20.1`: +Assuming we are releasing `0.22.2`: ```bash -$ git checkout 0.20 +$ git checkout 0.22 -# Edit `scrapy/VERSION` and modify version to `0.20.1` +# Edit `scrapy/VERSION` and modify version to `0.22.2` $ git add scrapy/VERSION -$ git commit -m "bumped version to 0.20.1" +$ git commit -m "bumped version to 0.22.2" # Add version, release date and changes to `docs/news.rst` -$ git log '--format=- %s (:commit:`%h`)' 0.20.0...0.20 # update docs/news.rst +$ git log '--format=- %s (:commit:`%h`)' 0.22.1...0.22 # update docs/news.rst $ git add docs/news.rst -$ git commit -m 'Add 0.20.1 release notes' +$ git commit -m 'Add 0.22.2 release notes' # Tag and push -$ git tag -a -m "version 0.20.1" 0.20.1 -$ git push origin 0.20 --tags -# It triggers scrapy-0.20 builder and publish pypi sources and debian packages automatically +$ git tag -a -m "version 0.22.2" 0.22.2 +$ git push origin 0.22 --tags +# It triggers scrapy-0.22 builder and publish pypi sources and debian packages automatically # Checkout master and cherry pick `docs/news.rst` changes. $ git checkout master -$ git cherry-pick 0.20 # resolve any conflicts on docs/news.rst +$ git cherry-pick 0.22 # resolve any conflicts on docs/news.rst $ git push origin master ``` \ No newline at end of file