Update to reflect conda-forge distribution

README.md

@@ -12,4 +12,4 @@ See the manual (https://dadi.readthedocs.io) and the example files in the source
 
 Also, please sign up for our mailing list, where we help the community with ∂a∂i. Please do search the archives before posting. Many questions come up repeatedly. (http://groups.google.com/group/dadi-user)
 
-The easiest way to install dadi is via conda, `conda install -c bioconda dadi`.
+The easiest way to install dadi is via conda, `conda install -c conda-forge dadi`.

doc/user-guide/installation.md

@@ -13,7 +13,7 @@ It is also recommended that you install
 - matplotlib
 - IPython
 
-The easiest way to obtain all these dependencies to install the [Anaconda Python Distribution](https://www.anaconda.com/distribution/). And the easiest way to install dadi is then via `conda`, using the command `conda install -c bioconda dadi`. dadi can also be installed via `pip`, using the command `python3 -m pip install dadi`.
+The easiest way to obtain all these dependencies to install the [Anaconda Python Distribution](https://www.anaconda.com/distribution/). And the easiest way to install dadi is then via `conda`, using the command `conda install -c conda-forge dadi`. dadi can also be installed via `pip`, using the command `python3 -m pip install dadi`.
 
 ### Installing from source
 

setup.py

@@ -120,9 +120,8 @@ numpy.distutils.core.setup(name='dadi',
 # (Testing) python3 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 # (Final) python3 -m twine upload dist/*   # Username is RyanGutenkunst
 # To distribute to Conda
-# Update bioconda-recipes via "git fetch https://github.com/bioconda/bioconda-recipes.git master" "git merge FETCH_HEAD"
-# Update recipe meta.yaml in bioconda-recipes/recipes/dadi with new version number and sha256. 
+# A pull request will automatically be created to update https://github.com/conda-forge/dadi-feedstock
+# Update recipe meta.yaml in dadi-feedstock/recipe with new version number and sha256. 
 #  (To generate sha256, use openssl dgst -sha256 dist/dadi-<version>.tar.gz
 # Then "git add meta.yaml" and "git commit" then "git push"
-# Push recipe and submit pull request
-# To test BioConda, I used bootstrap method on https://bioconda.github.io/contributor/building-locally.html
+# Then update the pull request