From dd4247f945da5523133578b3894651152bfcaf22 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Wed, 12 Jun 2019 10:50:15 +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: I35c087c9da9ea68fe586b6d21a94614d15954354 --- CONTRIBUTING.rst | 6 +++--- doc/requirements.txt | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 3708e41..88682e7 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,15 +1,15 @@ 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. -Bugs should be filed on Launchpadhttps://bugs.launchpad.net/fenix \ No newline at end of file +Bugs should be filed on Launchpad https://storyboard.openstack.org/#!/project/x/fenix diff --git a/doc/requirements.txt b/doc/requirements.txt index 03105b0..cf70631 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,10 @@ -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # 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. +# These are needed for docs generation + +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 os-api-ref>=1.6.0 # Apache-2.0 sphinxcontrib-seqdiag>=0.8.4 # BSD