From 89b61cddb2f6bbbab06e46a83c26185a6d9509f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Thu, 16 May 2019 16:56:33 +0200 Subject: [PATCH] Update Sphinx requirement and uncap grpcio Sphinx 2.0 no longer works on python 2.7, so we need to start capping it there. grpcio-1.16.0 introduced a bug that is breaking the tooz unit tests. cf. I8b026a0680a91a68281e354a59012565f4db1b95 for more info. 1.18.0 fixes the problem, so bump our minimum requirement to that version. Change-Id: I4b672563f4a80ce0e0478c867b7f85842ac3b0d3 --- doc/requirements.txt | 3 ++- requirements.txt | 2 +- setup.cfg | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index c870932b..38a67624 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,5 @@ -sphinx>=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,>=1.6.2;python_version>='3.4' # BSD openstackdocstheme>=1.11.0 # Apache-2.0 reno>=1.8.0 # Apache-2.0 diff --git a/requirements.txt b/requirements.txt index b2aee6de..9dab5026 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,4 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD futurist>=1.2.0 # Apache-2.0 oslo.utils>=3.15.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -grpcio>=1.0.0,<1.16.0 +grpcio>=1.18.0 diff --git a/setup.cfg b/setup.cfg index 7b399c7e..2c22a1d8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -73,7 +73,8 @@ test = os-testr>=0.8.0 # Apache-2.0 stestr>=2.0.0 doc = - sphinx>=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,>=1.6.2;python_version>='3.4' # BSD openstackdocstheme>=1.11.0 # Apache-2.0 reno>=1.8.0 # Apache-2.0