diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst index eac94799..4adde637 100644 --- a/docs/development/contributing.rst +++ b/docs/development/contributing.rst @@ -151,20 +151,25 @@ Then, to generate docs:: Creating releases ================= -1. Update changelog and commit it. +#. Update changelog and commit it. -2. Tag release:: +#. Merge the release branch (``develop`` in the example) into master:: - git tag -a -m "Release v0.1.0a0" v0.1.0a0 + git checkout master + git merge --no-ff -m "Release v0.2.0" develop -3. Push to GitHub:: +#. Tag the release:: + + git tag -a -m "Release v0.2.0" v0.2.0 + +#. Push to GitHub:: git push git push --tags -4. Build package and upload to PyPI:: +#. Build package and upload to PyPI:: rm MANIFEST # Will be regenerated by setup.py python setup.py sdist upload -5. Spread the word. +#. Spread the word.