Merge branch 'master' into release-0.5.5

README.md

@@ -30,6 +30,7 @@ For more information, check out the
 * [Examples](https://github.com/eth-cscs/abcpy/tree/v0.5.5/examples) directory and
 * [Reference](http://abcpy.readthedocs.io/en/v0.5.5/abcpy.html)
 
+
 Further, we provide a
 [collection of models](https://github.com/eth-cscs/abcpy-models) for which ABCpy
 has been applied successfully. This is a good place to look at more complicated inference setups.
@@ -55,6 +56,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.5/doc/literature/DuttaS-ABCpy-PASC-2017.bib)
+
 BibTex reference.
 
 

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.

doc/source/installation.rst

@@ -34,8 +34,10 @@ To create a package and install it, do
 ::
 
    make package
+
    pip3 install build/dist/abcpy-0.5.5-py3-none-any.whl
 
+
 Note that ABCpy requires Python3.