From 27bf708cef1436a9738dc87782ed8d4ceab9f8a1 Mon Sep 17 00:00:00 2001 From: duttar Date: Tue, 8 Jan 2019 13:28:23 +0000 Subject: [PATCH] Preparing release-0.5.4 --- README.md | 8 ++++---- VERSION | 2 +- doc/source/DEVELOP.rst | 13 +++++++------ doc/source/installation.rst | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ec75eca6..df39d5a6 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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. diff --git a/VERSION b/VERSION index be14282b..7d856835 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.3 +0.5.4 diff --git a/doc/source/DEVELOP.rst b/doc/source/DEVELOP.rst index 03d7ead1..57afac1a 100644 --- a/doc/source/DEVELOP.rst +++ b/doc/source/DEVELOP.rst @@ -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. diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 8e42e00f..2e5f0293 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -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.