DOC/CI: include api docs on travis

Author: jorisvandenbossche

.travis.yml

@@ -42,7 +42,6 @@ matrix:
       - NOSE_ARGS="not slow and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD_GUI=gtk2
-      - DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
     - python: 3.4
       env:
       - JOB_NAME: "34_nslow"
@@ -88,6 +87,13 @@ matrix:
       - JOB_TAG=_NUMPY_DEV
       - NOSE_ARGS="not slow and not network and not disabled"
       - PANDAS_TESTING_MODE="deprecate"
+    - python: 2.7
+      env:
+      - JOB_NAME: "doc_build"
+      - FULL_DEPS=true
+      - BUILD_TYPE=conda
+      - DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
+      - JOB_TAG=_DOC_BUILD
     allow_failures:
       - python: 2.7
         env:
@@ -121,6 +127,13 @@ matrix:
         - JOB_TAG=_NUMPY_DEV
         - NOSE_ARGS="not slow and not network and not disabled"
         - PANDAS_TESTING_MODE="deprecate"
+      - python: 2.7
+        env:
+        - JOB_NAME: "doc_build"
+        - FULL_DEPS=true
+        - BUILD_TYPE=conda
+        - DOC_BUILD=true
+        - JOB_TAG=_DOC_BUILD
 
 before_install:
   - echo "before_install"
@@ -149,13 +162,12 @@ before_script:
 
 script:
   - echo "script"
-  - ci/run_build_docs.sh &
+  - ci/run_build_docs.sh
   - ci/script.sh
 # nothing here, or failed tests won't fail travis
 
 after_script:
   - ci/install_test.sh
-  - if [ -f /tmp/doc.log ]; then cat /tmp/doc.log; fi
   - source activate pandas && ci/print_versions.py
   - ci/print_skipped.py /tmp/nosetests.xml
   - ci/lint.sh

ci/build_docs.sh

@@ -14,23 +14,22 @@ fi
 
 if [ x"$DOC_BUILD" != x"" ]; then
 
-    # we're running network tests, let's build the docs in the meantime
     echo "Will build docs"
-    conda install -n pandas sphinx=1.1.3 pygments ipython=2.4 --yes
 
     source activate pandas
+    conda install -n pandas -c r r rpy2 --yes
+
+    time sudo apt-get $APT_ARGS install dvipng
 
     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 ###############################
     echo # Log file for the doc build  #
     echo ###############################
 
-    echo -e "y\n" | ./make.py --no-api 2>&1
+    echo ./make.py
+    ./make.py
 
     cd /tmp/doc/build/html
     git config --global user.email "pandas-docs-bot@localhost.foo"

ci/requirements-2.7_DOC_BUILD.build

@@ -0,0 +1,4 @@
+dateutil
+pytz
+numpy
+cython

ci/requirements-2.7_DOC_BUILD.run

@@ -0,0 +1,17 @@
+sphinx=1.2.3
+ipython=3.2.1
+nbconvert
+matplotlib
+scipy
+lxml
+beautiful-soup
+html5lib
+pytables
+openpyxl=1.8.5
+xlrd
+xlwt
+xlsxwriter
+sqlalchemy
+numexpr
+bottleneck
+statsmodels

ci/run_build_docs.sh

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

ci/script.sh

@@ -4,6 +4,11 @@ echo "inside $0"
 
 source activate pandas
 
+# don't run the tests for the doc build
+if [ x"$DOC_BUILD" != x"" ]; then
+    exit 0
+fi
+
 if [ -n "$LOCALE_OVERRIDE" ]; then
     export LC_ALL="$LOCALE_OVERRIDE";
     echo "Setting LC_ALL to $LOCALE_OVERRIDE"