From 95bd9df2af11960e875685864a612de2f6b53a34 Mon Sep 17 00:00:00 2001 From: Jiaqi Liu Date: Fri, 25 Aug 2017 12:21:27 -0700 Subject: [PATCH 1/5] add to doc requirements.txt file --- .travis.yml | 8 +++++++- docs/doc-requirements.txt | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c88bc8595c..5d3caeb49a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ env: - GROUP=js/base - GROUP=js/services - GROUP=js/tree + - GROUP=doc before_install: - pip install --upgrade pip @@ -30,10 +31,14 @@ before_install: - npm upgrade -g npm - npm install - | - if [[ $GROUP == js* ]]; then + if [[ $GROUP == js* ]]; then npm install -g casperjs@1.1.3 phantomjs-prebuilt@2.1.7 fi - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels + - | + if [[ $GROUP == docs ]]; then + pip install doc-requirements.txt + fi install: - pip install -f travis-wheels/wheelhouse file://$PWD#egg=notebook[test] @@ -43,6 +48,7 @@ install: script: - 'if [[ $GROUP == js* ]]; then travis_retry python -m notebook.jstest ${GROUP:3}; fi' - 'if [[ $GROUP == python ]]; then nosetests -v --with-coverage --cover-package=notebook notebook; fi' + - 'if [[ $GROUP == doc ]]; then make -C docs/ html; fi' matrix: include: diff --git a/docs/doc-requirements.txt b/docs/doc-requirements.txt index 52a2ed2fb2..7a0ab9d718 100644 --- a/docs/doc-requirements.txt +++ b/docs/doc-requirements.txt @@ -1,2 +1,4 @@ sphinx>=1.3.6 -sphinx-rtd-theme \ No newline at end of file +sphinx-rtd-theme +nbsphinx==0.2.14 +pandoc From 708883521aeb5ac1b2cc170104f12db888818676 Mon Sep 17 00:00:00 2001 From: Jiaqi Liu Date: Fri, 25 Aug 2017 12:42:06 -0700 Subject: [PATCH 2/5] pip install doc-requirements in travis --- .travis.yml | 2 +- docs/doc-requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d3caeb49a..d09dff7d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels - | if [[ $GROUP == docs ]]; then - pip install doc-requirements.txt + pip install docs/doc-requirements.txt fi install: diff --git a/docs/doc-requirements.txt b/docs/doc-requirements.txt index 7a0ab9d718..fbdd21cd97 100644 --- a/docs/doc-requirements.txt +++ b/docs/doc-requirements.txt @@ -1,4 +1,3 @@ sphinx>=1.3.6 sphinx-rtd-theme nbsphinx==0.2.14 -pandoc From df76c6e2f5db96c3c89ea1377407b90645d31835 Mon Sep 17 00:00:00 2001 From: Jiaqi Liu Date: Fri, 25 Aug 2017 13:00:14 -0700 Subject: [PATCH 3/5] forgot -r --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d09dff7d76..6ebc6bf800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels - | if [[ $GROUP == docs ]]; then - pip install docs/doc-requirements.txt + pip install -r docs/doc-requirements.txt fi install: From 3a23a69d97a51a52294a1328976da31109a3e6e1 Mon Sep 17 00:00:00 2001 From: Jiaqi Liu Date: Fri, 25 Aug 2017 13:22:25 -0700 Subject: [PATCH 4/5] rename doc group to docs --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ebc6bf800..26c3afec8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: - GROUP=js/base - GROUP=js/services - GROUP=js/tree - - GROUP=doc + - GROUP=docs before_install: - pip install --upgrade pip @@ -48,7 +48,7 @@ install: script: - 'if [[ $GROUP == js* ]]; then travis_retry python -m notebook.jstest ${GROUP:3}; fi' - 'if [[ $GROUP == python ]]; then nosetests -v --with-coverage --cover-package=notebook notebook; fi' - - 'if [[ $GROUP == doc ]]; then make -C docs/ html; fi' + - 'if [[ $GROUP == docs ]]; then make -C docs/ html; fi' matrix: include: From 44471d97f4aece8d06f2c7a55ca4afbdb8d54b9b Mon Sep 17 00:00:00 2001 From: Jiaqi Liu Date: Fri, 25 Aug 2017 14:02:13 -0700 Subject: [PATCH 5/5] docs only run in python3 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 26c3afec8b..79ebba586a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,9 @@ matrix: env: GROUP=python - python: 3.4 env: GROUP=python + exclude: + - python: 2.7 + env: GROUP=docs after_success: - codecov