From d178dbbe4f906c8ceab019cacbbc245722df2481 Mon Sep 17 00:00:00 2001
From: Raf Geens <rafgeens@gmail.com>
Date: Fri, 11 May 2018 21:22:26 +0200
Subject: [PATCH] Enable building docs in the Docker image (includes Sphinx
 version bump to 1.7.1) (#4729)

* Added docs requirements to Docker image

* sphinx_celery requires Sphinx 1.7.1

pip-9.0.1 didn't complain about an older version being installed, but
pip-10.0.1 does.
---
 docker/Dockerfile     | 1 +
 requirements/docs.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ede7c020685..c54c1b0d27b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -58,6 +58,7 @@ RUN pyenv local python2.7 python3.4 python3.5 python3.6
 # Setup one celery environment for basic development use
 RUN pyenv exec pip install \
   -r requirements/default.txt \
+  -r requirements/docs.txt \
   -r requirements/pkgutils.txt \
   -r requirements/test.txt \
   -r requirements/test-ci-base.txt \
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 4a1990005f3..01bd68a635a 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -1,4 +1,4 @@
 git+https://github.com/celery/sphinx_celery.git
-Sphinx==1.6.5
+Sphinx==1.7.1
 typing
 -r extras/sqlalchemy.txt