From 1c6ac903da47e8b06c95cd7eb68c9cee936e068c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 20 May 2019 08:14:09 +0200
Subject: [PATCH] Update docs jobs

Replace obsolete build-sphinx job with tox-docs which runs "tox -e docs"
directly.

Update sphinx requirements for python 3.

Depends-On: https://review.opendev.org/660026
Change-Id: Ibb22861e7b1e0e1e40f155043db8b3e554eaf246
---
 .zuul.yaml            | 2 +-
 test-requirements.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a9d0ea9..8b2dc99 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,7 @@
       - publish-to-pypi
     check:
       jobs:
-        - build-openstack-sphinx-docs:
+        - tox-docs:
             voting: false
         - requirements-check:
             voting: false
diff --git a/test-requirements.txt b/test-requirements.txt
index 6b3aafc..8e554d6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,8 @@
 hacking>=0.11.0,<0.12  # Apache-2.0
 faker>=0.8.16
 mock>=2.0.0
-sphinx>=1.5.1  # BSD
+sphinx>=1.5.1,<2.0.0;python_version=='2.7'  # BSD
+sphinx>=1.5.1;python_version>='3.4'  # BSD
 coverage>=3.6  # Apache-2.0
 fixtures>=0.3.14
 python-subunit>=1.3.0