add ipython (or alternative new ones from neurodebian) into Build-Depends-Indep to build docs

yarikoptic · yarikoptic · commit dfd699a910da · 2015-06-05T11:16:06.000-04:00
diff --git a/debian/changelog b/debian/changelog
@@ -3,6 +3,8 @@ pandas (0.16.1+git97-gbc7d48f-1) unstable; urgency=medium
   * Fresh upstream release (Closes: #787432)
   * debian/{control,rules}
     - build -doc package (Closes: #660900)
+    - add ipython (or alternative new ones from neurodebian) into
+      Build-Depends-Indep to build docs
 
  -- Yaroslav Halchenko <debian@onerussian.com>  Fri, 05 Jun 2015 08:01:40 -0400
 
diff --git a/debian/control b/debian/control
@@ -33,6 +33,8 @@ Build-Depends: debhelper (>= 7.0.50),
                python3-bs4,
                python3-six,
                xvfb, xauth, xclip,
+Build-Depends-Indep:
+ ipython (>= 0.12) | ipython2x | ipython1x,
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
 Standards-Version: 3.9.5
diff --git a/debian/patches/deb_doc_donotoverride_PYTHONPATH b/debian/patches/deb_doc_donotoverride_PYTHONPATH
@@ -0,0 +1,12 @@
+--- a/doc/make.py
++++ b/doc/make.py
+@@ -26,7 +26,8 @@ import sphinx
+ import argparse
+ import jinja2
+ 
+-os.environ['PYTHONPATH'] = '..'
++# Debian's debian/rules overrides it to point to correct built pandas
++# os.environ['PYTHONPATH'] = '..'
+ 
+ SPHINX_BUILD = 'sphinxbuild'
+ 
diff --git a/debian/patches/series b/debian/patches/series
@@ -1,3 +1,4 @@
+deb_doc_donotoverride_PYTHONPATH
 deb_skip_test_precision_i386
 deb_skip_stata_on_bigendians
 deb_disable_googleanalytics

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+deb_doc_donotoverride_PYTHONPATH`
`1`	`2`	`deb_skip_test_precision_i386`
`2`	`3`	`deb_skip_stata_on_bigendians`
`3`	`4`	`deb_disable_googleanalytics`