Skip to content

Commit c8e58b0

Browse files
DOC/CI: include api docs on travis
1 parent db0094d commit c8e58b0

6 files changed

+47
-10
lines changed

.travis.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ matrix:
4242
- NOSE_ARGS="not slow and not disabled"
4343
- FULL_DEPS=true
4444
- CLIPBOARD_GUI=gtk2
45-
- DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
4645
- python: 3.4
4746
env:
4847
- JOB_NAME: "34_nslow"
@@ -88,6 +87,13 @@ matrix:
8887
- JOB_TAG=_NUMPY_DEV
8988
- NOSE_ARGS="not slow and not network and not disabled"
9089
- PANDAS_TESTING_MODE="deprecate"
90+
- python: 2.7
91+
env:
92+
- JOB_NAME: "doc_build"
93+
- FULL_DEPS=true
94+
- BUILD_TYPE=conda
95+
- DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
96+
- JOB_TAG=_DOC_BUILD
9197
allow_failures:
9298
- python: 2.7
9399
env:
@@ -121,6 +127,13 @@ matrix:
121127
- JOB_TAG=_NUMPY_DEV
122128
- NOSE_ARGS="not slow and not network and not disabled"
123129
- PANDAS_TESTING_MODE="deprecate"
130+
- python: 2.7
131+
env:
132+
- JOB_NAME: "doc_build"
133+
- FULL_DEPS=true
134+
- BUILD_TYPE=conda
135+
- DOC_BUILD=true
136+
- JOB_TAG=_DOC_BUILD
124137

125138
before_install:
126139
- echo "before_install"
@@ -149,13 +162,12 @@ before_script:
149162

150163
script:
151164
- echo "script"
152-
- ci/run_build_docs.sh &
165+
- ci/run_build_docs.sh
153166
- ci/script.sh
154167
# nothing here, or failed tests won't fail travis
155168

156169
after_script:
157170
- ci/install_test.sh
158-
- if [ -f /tmp/doc.log ]; then cat /tmp/doc.log; fi
159171
- source activate pandas && ci/print_versions.py
160172
- ci/print_skipped.py /tmp/nosetests.xml
161173
- ci/lint.sh

ci/build_docs.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,22 @@ fi
1414

1515
if [ x"$DOC_BUILD" != x"" ]; then
1616

17-
# we're running network tests, let's build the docs in the meantime
1817
echo "Will build docs"
19-
conda install -n pandas sphinx=1.1.3 pygments ipython=2.4 --yes
2018

2119
source activate pandas
20+
conda install -n pandas -c r r rpy2 --yes
21+
22+
time sudo apt-get $APT_ARGS install dvipng
2223

2324
mv "$TRAVIS_BUILD_DIR"/doc /tmp
2425
cd /tmp/doc
2526

26-
rm /tmp/doc/source/api.rst # no R
27-
rm /tmp/doc/source/r_interface.rst # no R
28-
2927
echo ###############################
3028
echo # Log file for the doc build #
3129
echo ###############################
3230

33-
echo -e "y\n" | ./make.py --no-api 2>&1
31+
echo ./make.py
32+
./make.py
3433

3534
cd /tmp/doc/build/html
3635
git config --global user.email "[email protected]"

ci/requirements-2.7_DOC_BUILD.build

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dateutil
2+
pytz
3+
numpy
4+
cython

ci/requirements-2.7_DOC_BUILD.run

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
sphinx=1.2.3
2+
ipython=3.2.1
3+
nbconvert
4+
matplotlib
5+
scipy
6+
lxml
7+
beautiful-soup
8+
html5lib
9+
pytables
10+
openpyxl=1.8.5
11+
xlrd
12+
xlwt
13+
xlsxwriter
14+
sqlalchemy
15+
numexpr
16+
bottleneck
17+
statsmodels

ci/run_build_docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo "inside $0"
44

5-
"$TRAVIS_BUILD_DIR"/ci/build_docs.sh 2>&1 > /tmp/doc.log &
5+
"$TRAVIS_BUILD_DIR"/ci/build_docs.sh 2>&1
66

77
# wait until subprocesses finish (build_docs.sh)
88
wait

ci/script.sh

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ echo "inside $0"
44

55
source activate pandas
66

7+
# don't run the tests for the doc build
8+
if [ x"$DOC_BUILD" != x"" ]; then
9+
exit 0
10+
fi
11+
712
if [ -n "$LOCALE_OVERRIDE" ]; then
813
export LC_ALL="$LOCALE_OVERRIDE";
914
echo "Setting LC_ALL to $LOCALE_OVERRIDE"

0 commit comments

Comments
 (0)