From 36a0dcaf8dd9159b59ee5dcf8dd3957ecfe0f188 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Thu, 20 Jun 2019 00:29:36 +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. Update some URLs to latest 3. Remove unncessary "==" Change-Id: I48206450371b557f51b0842976d48c9042173df2 --- CONTRIBUTING.rst | 4 ++-- doc/source/contributor/index.rst | 6 +++--- doc/source/index.rst | 2 +- test-requirements.txt | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 9fbcc2e..3743d97 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,14 +1,14 @@ If you would like to contribute to the development of OpenStack, you must follow the steps in this page: - http://docs.openstack.org/infra/manual/developers.html + https://docs.openstack.org/infra/manual/developers.html If you already have a good understanding of how the system works and your OpenStack accounts are set up, you can skip to the development workflow section of this documentation to learn how changes to OpenStack should be submitted for review via the Gerrit tool: - http://docs.openstack.org/infra/manual/developers.html#development-workflow + https://docs.openstack.org/infra/manual/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst index 036e449..38cef81 100644 --- a/doc/source/contributor/index.rst +++ b/doc/source/contributor/index.rst @@ -1,6 +1,6 @@ -=========================== - Contributor Documentation -=========================== +========================= +Contributor Documentation +========================= .. toctree:: :maxdepth: 2 diff --git a/doc/source/index.rst b/doc/source/index.rst index e332fbd..8c77f1d 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. Welcome to os-service-types's documentation! -======================================================== +============================================ Contents: diff --git a/test-requirements.txt b/test-requirements.txt index 2b5ec10..be8a39d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,8 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD -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,>=1.6.2;python_version>='3.4' # BSD stestr>=2.0.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD