mirror of
https://github.com/wassname/scikit-image.git
synced 2026-06-27 19:48:43 +08:00
Merge pull request #1699 from jwiggins/use-ccache
Enable ccache and Sphinx cache on Travis
This commit is contained in:
+5
-1
@@ -11,9 +11,12 @@ cache:
|
||||
# See http://docs.travis-ci.com/user/caching/#pip-cache
|
||||
directories:
|
||||
- $HOME/.cache/pip
|
||||
- $HOME/.cache/sphinx
|
||||
- $HOME/.ccache
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- ccache
|
||||
- libfreeimage3
|
||||
- texlive
|
||||
- texlive-latex-extra
|
||||
@@ -40,8 +43,9 @@ python:
|
||||
- 3.4
|
||||
|
||||
before_install:
|
||||
- ccache -s
|
||||
- export PATH=/usr/lib/ccache:${PATH}
|
||||
- source tools/travis_before_install.sh
|
||||
|
||||
- which python; python --version
|
||||
- python check_bento_build.py
|
||||
- tools/build_versions.py
|
||||
|
||||
+2
-1
@@ -5,12 +5,13 @@
|
||||
PYTHON ?= python
|
||||
SPHINXOPTS ?=
|
||||
SPHINXBUILD ?= python $(shell which sphinx-build)
|
||||
SPHINXCACHE ?= build/doctrees
|
||||
PAPER ?=
|
||||
|
||||
# Internal variables.
|
||||
PAPEROPT_a4 = -D latex_paper_size=a4
|
||||
PAPEROPT_letter = -D latex_paper_size=letter
|
||||
ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
|
||||
ALLSPHINXOPTS = -d $(SPHINXCACHE) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
|
||||
DEST = build
|
||||
.PHONY: all help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest gitwash gh-pages release_notes random_gallery
|
||||
|
||||
|
||||
+2
-1
@@ -296,7 +296,8 @@ plot2rst_rcparams = {'image.cmap' : 'gray',
|
||||
# -----------------------------------------------------------------------------
|
||||
# intersphinx
|
||||
# -----------------------------------------------------------------------------
|
||||
_python_doc_base = 'http://docs.python.org/2.7'
|
||||
_python_version_str = '{0.major}.{0.minor}'.format(sys.version_info)
|
||||
_python_doc_base = 'http://docs.python.org/' + _python_version_str
|
||||
intersphinx_mapping = {
|
||||
'python': (_python_doc_base, None),
|
||||
'numpy': ('http://docs.scipy.org/doc/numpy',
|
||||
|
||||
@@ -9,7 +9,7 @@ section_end "Test.with.min.requirements"
|
||||
|
||||
section "Build.docs"
|
||||
if [[ ($PY != 2.6) && ($PY != 3.2) ]]; then
|
||||
make html
|
||||
export SPHINXCACHE=$HOME/.cache/sphinx; make html
|
||||
fi
|
||||
section_end "Build.docs"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user