From a2444ef310da9757f7f3eb1e683983534a823a79 Mon Sep 17 00:00:00 2001 From: Leopold Talirz Date: Mon, 19 Feb 2018 15:59:45 +0100 Subject: [PATCH] fix #1143 * disable matplotlib requirement for rtd (was not needed) * make sure that travis installs the same python packages as rtd for building the docs --- .travis.yml | 4 +--- docs/source/conf.py | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6a64a1dc0..5380af4d0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,8 @@ before_install: install: # Upgrade pip setuptools and wheel to be able to run the next command - pip install -U pip wheel setuptools - - pip install -r requirements.txt # Install AiiDA with some optional dependencies - - pip install .[REST,docs,atomic_tools,testing,dev_precommit,dev_sphinxext] - + - if [ "$TEST_TYPE" == "docs" ]; then pip install . && pip install -r docs/requirements_for_rtd.txt; else pip install .[rest,docs,atomic_tools,testing,dev_precommit]; fi env: ## Build matrix to test both backends, and the docs diff --git a/docs/source/conf.py b/docs/source/conf.py index c026b4b2bc..30da3c43ef 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -44,6 +44,7 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode', 'IPython.sphinxext.ipython_console_highlighting', 'IPython.sphinxext.ipython_directive'] +ipython_mplbackend = "" todo_include_todos = True