From d92ea1f8be490e5c47aed72dc7ed114372f0b9bd Mon Sep 17 00:00:00 2001 From: jacky06 Date: Tue, 18 Jun 2019 22:29:09 +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: Ied4095b176b20795f6a8d4d7a84d01d958d76896 --- HACKING.rst | 2 +- doc/source/index.rst | 6 +++--- doc/source/user/index.rst | 6 +++--- lower-constraints.txt | 2 +- test-requirements.txt | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 71cfe4d..cf983c6 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,5 +1,5 @@ Automaton Style Commandments -=============================================== +============================ Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff --git a/doc/source/index.rst b/doc/source/index.rst index 09a487c..ca1f1b1 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,6 +1,6 @@ -======================================= - Welcome to automaton's documentation! -======================================= +===================================== +Welcome to automaton's documentation! +===================================== Friendly state machines for python. diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index f109e35..11c2443 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -1,6 +1,6 @@ -====================== - automaton User Guide -====================== +==================== +automaton User Guide +==================== .. toctree:: :maxdepth: 2 diff --git a/lower-constraints.txt b/lower-constraints.txt index cfdd64e..c49b450 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -37,7 +37,7 @@ requestsexceptions==1.2.0 restructuredtext-lint==1.1.1 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 +Sphinx==1.6.2 sphinxcontrib-websupport==1.0.1 stevedore==1.20.0 stestr==2.0.0 diff --git a/test-requirements.txt b/test-requirements.txt index 78d24a7..2c70fcb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,8 @@ hacking<0.11,>=0.10.0 doc8>=0.6.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # 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.18.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0