Updated Scrapy release procedure (markdown)

Daniel Graña 2013-08-12 20:16:42 -07:00
parent 3ba245ac76
commit fa5f51e59c
1 changed files with 13 additions and 13 deletions

@ -4,14 +4,14 @@ This page outlines the procedure used to release a new (major/minor) version of
## Version and git branch
Here is an example, assuming we are releasing 0.18:
Here is an example, assuming we are releasing 0.20.0:
```bash
$ git checkout -b 0.20 master
# edit scrapy/VERSION and modify version to 0.20.0
# edit docs/news.rst and set release date for 0.20
$ git commit -a -m "bumped version to 0.20.0"
$ git tag -a -m "version 0.18.0" 0.20.0
$ git tag -a -m "version 0.20.0" 0.20.0
$ git push origin 0.20 --tags
$ git checkout master
@ -47,27 +47,27 @@ $ git push origin master --tags
## Micro/bugfix releases
Assuming we are releasing `0.16.5`:
Assuming we are releasing `0.18.1`:
```bash
$ git checkout 0.16
$ git checkout 0.18
# Edit `scrapy/__init__.py` and modify version to `0.16.6`
# Edit `scrapy/__init__.py` and modify version to `0.18.1`
$ git add scrapy/__init__.py
$ git commit -a -m "bumped version to 0.16.6"
$ git commit -a -m "bumped version to 0.18.1"
# Add version, release date and changes to `docs/news.rst`
$ git log '--format=- %s (:commit:`%h`)' 0.16.5..0.16 # update docs/news.rst
$ git log '--format=- %s (:commit:`%h`)' 0.18.0...0.18.1 # update docs/news.rst
$ git add docs/news.rst
$ git commit -m 'Add 0.16.6 release notes'
$ git commit -m 'Add 0.18.1 release notes'
# Tag 0.16.6 and push
$ git tag -a -m "version 0.16.6" 0.16.6
$ git push origin 0.16 --tags
# It triggers scrapy-0.16 builder and publish pypi sources and debian packages automatically
# Tag 0.20.1 and push
$ git tag -a -m "version 0.18.1" 0.18.1
$ git push origin 0.20 --tags
# It triggers scrapy-0.20 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.16 # resolve any conflicts on docs/news.rst
$ git cherry-pick 0.18 # resolve any conflicts on docs/news.rst
$ git push origin master
```