camb now installed as dependency

README.rst

@@ -21,7 +21,7 @@ Halo Mass Function for a range of varying parameters. It is also the backend to
 Version 3 Note
 --------------
 Due to the general trend of moving to Python 3 by important projects such as IPython and astropy, from
-version 3.0, hmf is compatible with Python 3, and from version 3.1, it will drop support for Python 2.
+version 3.0, hmf is compatible with Python 3, and from version 3.1, it will drop (official) support for Python 2.
 
 Documentation
 -------------

docs/index.rst

@@ -32,13 +32,12 @@ Features
 Installation
 ------------
 `hmf` is built on several other packages, most of which will be familiar to the
-scientific python programmer. All of these dependencies *should* be automatically
-installed when installing `hmf`, except for one. Explicitly, the dependencies are
-numpy, scipy, scitools, cosmolopy and emcee. 
+scientific python programmer. All of these dependencies should be automatically
+installed when installing `hmf`. Explicitly, the dependencies are
+numpy, scipy, astropy and camb.
 
 You will only need `emcee` if you are going to be using the fitting capabilities
-of `hmf`. The final, optional, library is `camb <https://github.com/cmbant/CAMB/pycamb>`_,
-for which you should consult the repository for install instructions.
+of `hmf`.
 
 Finally the `hmf` package needs to be installed: ``pip install hmf``. If you want
 to install the latest build (not necessarily stable), grab it `here 

setup.py

@@ -37,7 +37,8 @@ def find_version(*file_paths):
     packages=find_packages(),
     install_requires=["numpy>=1.6.2",
                       "scipy>=0.12.0",
-                      "astropy>=1.1"],
+                      "astropy>=1.1",
+                      "camb>=0.1.6"],
     scripts=["scripts/hmf", "scripts/hmf-fit"],
     author="Steven Murray",
     author_email="steven.murray@curtin.edu.au",