From a176de01d73739b7084f808c35c0a574aa62f843 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Wed, 19 Jun 2019 00:52:00 +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 Change-Id: I1bb1b6861f804f3a28d863bcab795ed39819d3aa --- CONTRIBUTING.rst | 4 ++-- README.rst | 2 +- doc/source/contributor/index.rst | 6 +++--- test-requirements.txt | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index db26bb9..b2538df 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -2,13 +2,13 @@ If you would like to contribute to the development of OpenStack, you must follow the steps in the "If you're a developer, start here" section of this page: - http://wiki.openstack.org/HowToContribute + https://docs.openstack.org/infra/manual/developers.html Once those steps have been completed, changes to OpenStack should be submitted for review via the Gerrit tool, following the workflow documented at: - http://wiki.openstack.org/GerritWorkflow + https://docs.openstack.org/infra/manual/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. diff --git a/README.rst b/README.rst index 95e6e34..d946e11 100644 --- a/README.rst +++ b/README.rst @@ -33,7 +33,7 @@ installed locally already. In this case, you can interact with the testr command directly. Running `testr run` will run the entire test suite. `testr run --parallel` will run it in parallel (this is the default incantation tox uses.) More information about testr can be found at: -http://wiki.openstack.org/testr +https://wiki.openstack.org/wiki/Testr Basic Usage ----------- diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst index ed5290b..3d4ceb4 100644 --- a/doc/source/contributor/index.rst +++ b/doc/source/contributor/index.rst @@ -1,5 +1,5 @@ -============== - Contributing -============== +============ +Contributing +============ .. include:: ../../../CONTRIBUTING.rst diff --git a/test-requirements.txt b/test-requirements.txt index b692c51..ac71b4a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,6 +14,7 @@ testtools>=2.2.0 # MIT six>=1.10.0 # MIT # this is required for the docs build jobs -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD openstackdocstheme>=1.18.1 # Apache-2.0