Skip to content

Commit

Permalink
Preparing release-0.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
duttar committed Jan 8, 2019
1 parent 6cc8614 commit 27bf708
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ scientists by providing
# Documentation
For more information, check out the

* [Documentation](http://abcpy.readthedocs.io/en/v0.5.3)
* [Examples](https://github.com/eth-cscs/abcpy/tree/v0.5.3/examples) directory and
* [Reference](http://abcpy.readthedocs.io/en/v0.5.3/abcpy.html)
* [Documentation](http://abcpy.readthedocs.io/en/v0.5.4)
* [Examples](https://github.com/eth-cscs/abcpy/tree/v0.5.4/examples) directory and
* [Reference](http://abcpy.readthedocs.io/en/v0.5.4/abcpy.html)

Further, we provide a
[collection of models](https://github.com/eth-cscs/abcpy-models) for which ABCpy
Expand All @@ -54,7 +54,7 @@ finally CSCS (Swiss National Super Computing Center) for their generous support.

There is a paper in the proceedings of the 2017 PASC conference. In case you use
ABCpy for your publication, we would appreciate a citation. You can use
[this](https://github.com/eth-cscs/abcpy/blob/v0.5.3/doc/literature/DuttaS-ABCpy-PASC-2017.bib)
[this](https://github.com/eth-cscs/abcpy/blob/v0.5.4/doc/literature/DuttaS-ABCpy-PASC-2017.bib)
BibTex reference.


Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.3
0.5.4
13 changes: 7 additions & 6 deletions doc/source/DEVELOP.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ new version `M.m.b':
1. Create a release branch `release-M.m.b`
2. Adapt `VERSION` file in the repos root directory: `echo M.m.b > VERSION`
3. Adapt `README.md` file: adapt links to correct version of `User Documentation` and `Reference`
4. Merge all desired feature branches into the release branch
5. Create a pull/ merge request: release branch -> master
4. Adapt `doc/source/DEVELOP.rst` file: to install correct version of ABCpy
5. Merge all desired feature branches into the release branch
6. Create a pull/ merge request: release branch -> master

After a successful merge:

5. Create tag vM.m.b (`git tag vM.m.b`)
6. Retag tag `stable` to the current version
7. Push the tag (`git push --tags`)
8. Create a release in GitHub
7. Create tag vM.m.b (`git tag vM.m.b`)
8. Retag tag `stable` to the current version
9. Push the tag (`git push --tags`)
10. Create a release in GitHub

The new tag on master will signal Travis to deploy a new package to Pypi while
the GitHub release is just for user documentation.
2 changes: 1 addition & 1 deletion doc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To create a package and install it, do
::

make package
pip3 install build/dist/abcpy-0.5.1-py3-none-any.whl
pip3 install build/dist/abcpy-0.5.4-py3-none-any.whl

Note that ABCpy requires Python3.

Expand Down

0 comments on commit 27bf708

Please sign in to comment.