From 624fb58fc09a24bc793c12840d0fde32a7ab21a1 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Tue, 18 Jun 2019 23:36:25 +0800 Subject: [PATCH] Sync Sphinx requirement 1. Sync sphinx dependency with global requirements. It caps python 2 since sphinx 2.0 no longer supports Python 2.7. 2. Remove unncessary "==" Change-Id: Ic8d4ac21906dd78159375a51fc7514f8d664f22a --- HACKING.rst | 2 +- doc/requirements.txt | 7 ++++++- doc/source/pluggable_db.rst | 5 ----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index faa615e2e..04e11762e 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ dragonflow Style Commandments -=============================================== +============================= Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff --git a/doc/requirements.txt b/doc/requirements.txt index 23c6cf5ac..84e7dd54e 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,3 +1,8 @@ -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +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.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/doc/source/pluggable_db.rst b/doc/source/pluggable_db.rst index 78d827ac1..9af8e3a21 100644 --- a/doc/source/pluggable_db.rst +++ b/doc/source/pluggable_db.rst @@ -140,8 +140,3 @@ setups today there are many isolated topologies) Reactive -------- - - - - -