From 15c842fba2adff14be90afd71441466d16df9839 Mon Sep 17 00:00:00 2001 From: chenke Date: Tue, 14 May 2019 13:37:49 +0800 Subject: [PATCH] Update Sphinx requirement Sphinx 2.0 no longer works on python 2.7, so we need to start capping it there as well. The errors are as follow: Requirement(package='sphinx', location='', specifiers='!=1.6.6,!=1.6.7,>=1.6.5' does not match "python_version>='3.4'" Requirement(package='sphinx', location='', specifiers='!=1.6.6,!=1.6.7,>=1.6.5' does not match "python_version=='2.7'" Could not find a global requirements entry to match package sphinx. If the package is already included in the global list, the name or platform markers there may not match the local settings. Change-Id: I6dad56ffbb9e85e36cacea1a89565c2fc8248fbf --- doc/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 966197a1d..d204a868f 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. openstackdocstheme>=1.20.0 # Apache-2.0 -sphinx>=1.6.5,!=1.6.6,!=1.6.7 # BSD +sphinx>=1.6.5,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.6.5,!=1.6.6,!=1.6.7;python_version>='3.4' # BSD sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0 reno>=2.7.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD