From aef200d5b7d91d020e9c4db47af8f3ad05acf62c Mon Sep 17 00:00:00 2001
From: Phil Elson <pelson.pub@gmail.com>
Date: Thu, 2 Nov 2017 17:10:52 +0000
Subject: [PATCH] Handled documentation requirements installation.

---
 .travis.yml           | 7 +++++++
 requirements/docs.txt | 1 +
 setup.py              | 3 +--
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 requirements/docs.txt

diff --git a/.travis.yml b/.travis.yml
index dc29418c3c..3143b09a96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,13 @@ install:
       conda install --quiet --file ${CONDA_REQS_FILE};
     fi
 
+
+  - >
+    if [[ "${TEST_TARGET}" == 'doctest' ]]; then
+        conda install --quiet --file requirements/docs.txt
+    fi
+
+
   # JUST FOR NOW : Install latest version of iris-grib.
   # TODO : remove when this release is available on conda-forge.
   - if [[ "$TEST_MINIMAL" != true ]]; then
diff --git a/requirements/docs.txt b/requirements/docs.txt
new file mode 100644
index 0000000000..6966869c70
--- /dev/null
+++ b/requirements/docs.txt
@@ -0,0 +1 @@
+sphinx
diff --git a/setup.py b/setup.py
index 7e44fc5495..b2559bf45b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,13 @@
 from __future__ import print_function
 
 from contextlib import contextmanager
-from distutils.core import Command
 from distutils.util import convert_path
 import os
 from shutil import copyfile
 import sys
 import textwrap
 
-from setuptools import setup
+from setuptools import setup, Command
 from setuptools.command.develop import develop as develop_cmd
 from setuptools.command.build_py import build_py