Skip to content

Commit

Permalink
Should use forward slash for release branches
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilon Sjögren committed Nov 19, 2020
1 parent a0abdb8 commit 991a93d
Showing 1 changed file with 43 additions and 43 deletions.
86 changes: 43 additions & 43 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

Steps for creating a new release of Terrascript (as of August 2019).

* Create a new branch ``release-x.x.x`` from ``develop-x.x``.
```
git checkout -b release-x.x.x
```
* Create a new branch ``release/x.x.x`` from ``develop-x.x``.
```
git checkout -b release/x.x.x
```
* Update ``__version__`` in ``terrascript.__init__.py``.
* Update version in ``docs/conf.py``.
* Review ``setup.py``.
Expand All @@ -16,50 +16,50 @@ git checkout -b release-x.x.x
* Run ``make black``.
* Run ``make test``.
* Run ``make docs``.
* Commit and push the branch ``release-x.x.x`` to Github.
```
git commit -a -m 'Preparing release x.x.x'
git push origin release-x.x.x
```
* Commit and push the branch ``release/x.x.x`` to Github.
```
git commit -a -m 'Preparing release x.x.x'
git push origin release/x.x.x
```
* Check whether all tests on [Travis-CI](https://www.travis-ci.org/mjuenema/python-terrascript) pass.
* Fix any problems before continuing.
* Tag the revision ``x.x.x`` and push the tag to Github.
```
git tag -a x.x.x -m 'Release x.x.x'
git push --tags
```
```
git tag -a x.x.x -m 'Release x.x.x'
git push --tags
```
* Upload the release to [PyPi Test](https://test.pypi.org/project/terrascript/).
```
pip3 install wheel twine
python3 setup.py sdist bdist_wheel
ls dist/
twine upload --repository-url https://test.pypi.org/legacy/ dist/*
```
```
pip3 install wheel twine
python3 setup.py sdist bdist_wheel
ls dist/
twine upload --repository-url https://test.pypi.org/legacy/ dist/*
```
* Test installing package from PyPi Test.
```
mkvirtualenv terrascript-test
pip install -i https://test.pypi.org/simple/ terrascript==0.8.0
deactivate
rmvirtualenv terrascript-test
```
```
mkvirtualenv terrascript-test
pip install -i https://test.pypi.org/simple/ terrascript==0.8.0
deactivate
rmvirtualenv terrascript-test
```
* Upload the release to [PyPi](https://pypi.org/project/terrascript/).
```
twine upload dist/*
```
```
twine upload dist/*
```
* Commit any outstanding changes that will got into the next release.
* Merge the branch ``release-x.x.x`` into ``master`` and push to Github.
```
git checkout master
git merge release-x.x.x
git push origin master
```
* Delete branch ``release-x.x.x``.
```
git push --delete origin release-x.x.x
```
* Merge the branch ``release/x.x.x`` into ``master`` and push to Github.
```
git checkout master
git merge release/x.x.x
git push origin master
```
* Delete branch ``release/x.x.x``.
```
git push --delete origin release/x.x.x
```
* Merge ``master``` back into ``develop``.
```
git checkout develop
git merge master
git push origin develop
```
```
git checkout develop
git merge master
git push origin develop
```

0 comments on commit 991a93d

Please sign in to comment.