Merge pull request #1080 from obfuscurity/fix_install_doc_0.9.x

Fix install documentation for pip packages

docs/install-pip.rst

@@ -5,7 +5,7 @@ Versioned Graphite releases can be installed via `pip <http://pypi.python.org/py
 
 .. note::
 
-  In order to install carbon, you must install the Python Development Headers.  In Debian-based distributions, this will require ``apt-get install python-dev``, and in Red Hat-based distributions you will run ``yum install python-devel``.
+  In order to install carbon, you must install the development headers for Python and libffi. In Debian-based distributions, this will require ``apt-get install python-dev libffi-dev``, and in Red Hat-based distributions you will run ``yum install python-devel libffi-devel``.
 
 Installing in the Default Location
 ----------------------------------
@@ -14,7 +14,9 @@ simply execute as root:
 
 .. code-block:: none
 
-    pip install https://github.com/graphite-project/ceres/tarball/master
+    export PYTHONPATH="/opt/graphite/lib/:/opt/graphite/webapp/"
+    pip install -r https://raw.githubusercontent.com/graphite-project/carbon/0.9.13/requirements.txt
+    pip install -r https://raw.githubusercontent.com/graphite-project/graphite-web/0.9.13/requirements.txt
     pip install whisper
     pip install carbon
     pip install graphite-web

docs/install.rst

@@ -12,7 +12,7 @@ Basic Graphite requirements:
 
 * a UNIX-like Operating System
 * Python 2.6 or greater
-* `Pycairo`_
+* `cairocffi`_
 * `Django`_ 1.4 or greater
 * `django-tagging`_ 0.3.1 or greater
 * `Twisted`_ 8.0 or greater (10.0+ recommended)
@@ -47,7 +47,7 @@ Fulfilling Dependencies
 Most current Linux distributions have all of the requirements available in the base packages.
 RHEL based distributions may require the `EPEL`_ repository for requirements.
 Python module dependencies can be install with `pip`_ rather than system packages if desired or if using
-a Python version that differs from the system default. Some modules (such as Cairo) may require
+a Python version that differs from the system default. Some modules (such as cairocffi) may require
 library development headers to be available.
 
 .. _default-installation-layout :
@@ -161,6 +161,7 @@ Despair Not!  Even though running Graphite on Windows is completely unsupported
 
 
 .. _Apache: http://projects.apache.org/projects/http_server.html
+.. _cairocffi: https://github.com/SimonSapin/cairocffi
 .. _Django: http://www.djangoproject.com/
 .. _django-tagging: http://code.google.com/p/django-tagging/
 .. _Django database install: https://docs.djangoproject.com/en/dev/topics/install/#get-your-database-running
@@ -172,7 +173,6 @@ Despair Not!  Even though running Graphite on Windows is completely unsupported
 .. _mod_wsgi: http://code.google.com/p/modwsgi/
 .. _nginx: http://nginx.org/
 .. _pip: http://www.pip-installer.org/
-.. _Pycairo: http://www.cairographics.org/pycairo/
 .. _python-ldap: http://www.python-ldap.org/
 .. _python-memcache: http://www.tummy.com/Community/software/python-memcached/
 .. _python-rrdtool: http://oss.oetiker.ch/rrdtool/prog/rrdpython.en.html

requirements.txt

@@ -40,4 +40,4 @@ pytz
 sphinx
 sphinx_rtd_theme
 cairocffi
-git+git://github.com/graphite-project/whisper.git@0.9.x#egg=whisper
+git+git://github.com/graphite-project/whisper.git@0.9.13#egg=whisper