Merge branch 'docs'

Author: jreback

.travis.yml

@@ -180,6 +180,7 @@ before_script:
 
 script:
   - echo "script"
+  - ci/run_build_docs.sh &
   - ci/script.sh
 # nothing here, or failed tests won't fail travis
 

ci/build_docs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-
 cd "$TRAVIS_BUILD_DIR"
+echo "inside $0"
 
 git show --pretty="format:" --name-only HEAD~5.. --first-parent | grep -P "rst|txt|doc"
 
@@ -16,18 +16,20 @@ if [ x"$DOC_BUILD" != x"" ]; then
 
     # we're running network tests, let's build the docs in the meantime
     echo "Will build docs"
-    pip install sphinx==1.1.3 ipython
+    conda install -n pandas sphinx=1.1.3 pygments ipython=2.4 --yes
+
+    source activate pandas
 
     mv "$TRAVIS_BUILD_DIR"/doc /tmp
     cd /tmp/doc
 
     rm /tmp/doc/source/api.rst # no R
     rm /tmp/doc/source/r_interface.rst # no R
 
-    echo ############################### > /tmp/doc.log
-    echo # Log file for the doc build  # > /tmp/doc.log
-    echo ############################### > /tmp/doc.log
-    echo "" > /tmp/doc.log
+    echo ###############################
+    echo # Log file for the doc build  #
+    echo ###############################
+
     echo -e "y\n" | ./make.py --no-api 2>&1
 
     cd /tmp/doc/build/html

ci/run_build_docs.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "inside $0"
+
+"$TRAVIS_BUILD_DIR"/ci/build_docs.sh 2>&1 > /tmp/doc.log &
+
+# wait until subprocesses finish (build_docs.sh)
+wait
+
+exit 0

ci/script.sh

@@ -12,10 +12,6 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
     python -c "$pycmd"
 fi
 
-# conditionally build and upload docs to GH/pandas-docs/pandas-docs/travis
-"$TRAVIS_BUILD_DIR"/ci/build_docs.sh 2>&1 > /tmp/doc.log &
-# doc build log will be shown after tests
-
 if [ "$BUILD_TEST" ]; then
     echo "We are not running nosetests as this is simply a build test."
 else
@@ -25,7 +21,4 @@ fi
 
 RET="$?"
 
-# wait until subprocesses finish (build_docs.sh)
-wait
-
 exit "$RET"

doc/source/enhancingperf.rst

@@ -98,7 +98,7 @@ First we're going to need to import the cython magic function to ipython:
 
 .. ipython:: python
 
-   %load_ext Cython
+   %load_ext cythonmagic
 
 
 Now, let's simply copy our functions over to cython as is (the suffix