From 42b9d6ac70fc05cc30cda7fb0b17402d9b5246c9 Mon Sep 17 00:00:00 2001 From: pengyuesheng Date: Thu, 10 Oct 2019 14:29:54 +0800 Subject: Sync Sphinx requirement Sync sphinx dependency with global requirements. It caps python 2 since sphinx 2.0 no longer supports Python 2.7. Change-Id: I08fe97b5e15d7aae025f3d149c1242841d01ee5b --- doc/requirements.txt | 3 ++- test-requirements.txt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 03ec55f..117073f 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,7 +3,8 @@ # process, which may cause wedges in the gate later. # These are needed for docs generation openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.0 # Apache-2.0 mock>=2.0.0 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index b2c4e8f..a568462 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,6 @@ testtools>=2.2.0 # MIT stestr>=2.0.0 # Apache-2.0 # this is required for the docs build jobs -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -- cgit v1.2.1