From eea2fcc4b7e5c844019d99a5464b9a3bfe4e00cf Mon Sep 17 00:00:00 2001
From: Alan Saul <alan.daniel.saul@gmail.com>
Date: Fri, 8 Feb 2013 16:12:12 +0000
Subject: [PATCH] Added ipython to setup again and went back to
 numpy.distribute

---
 doc/conf.py | 2 +-
 setup.py    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index ab72789e..f7d3f920 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -132,7 +132,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 on_rtd = True
 if on_rtd:
     print "I am here"
-    #sys.path.append(os.path.abspath('../GPy'))
+    sys.path.append(os.path.abspath('../GPy'))
 
     import subprocess
 
diff --git a/setup.py b/setup.py
index acebd624..40c89ccb 100644
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import os
-#from numpy.distutils.core import Extension, setup
-from setuptools import setup
+from numpy.distutils.core import Extension, setup
 #from sphinx.setup_command import BuildDoc
 
 # Version number
@@ -29,7 +28,7 @@ setup(name = 'GPy',
       #          sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])],
       install_requires=['sympy', 'numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'],
       extras_require = {
-        'docs':['Sphinx'],
+        'docs':['Sphinx', 'ipython'],
       },
       #setup_requires=['sphinx'],
       #cmdclass = {'build_sphinx': BuildDoc},