From cef202b083a67c9b93c593ac026d88c488ca96f7 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Thu, 20 Jun 2019 00:34:08 +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 "==" Closes-Bug: #1835804 Change-Id: I36fbb56a56832d535facd9bff25d352c8f0274a1 --- CONTRIBUTING.rst | 4 ++-- doc/requirements.txt | 3 ++- releasenotes/source/pike.rst | 6 +++--- releasenotes/source/queens.rst | 6 +++--- releasenotes/source/stein.rst | 6 +++--- releasenotes/source/unreleased.rst | 6 +++--- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 99026f41..07d2d256 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,13 +1,13 @@ 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 Once those steps have been completed, changes to OpenStack should be submitted for review via the Gerrit tool, following the workflow documented at: - 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/requirements.txt b/doc/requirements.txt index e32955b1..43fdc7a8 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,3 +1,4 @@ -sphinx>=1.6.5,!=1.6.6,!=1.6.7 #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 reno>=2.5.0 # Apache-2.0 diff --git a/releasenotes/source/pike.rst b/releasenotes/source/pike.rst index e43bfc0c..9184412d 100644 --- a/releasenotes/source/pike.rst +++ b/releasenotes/source/pike.rst @@ -1,6 +1,6 @@ -=================================== - Pike Series Release Notes -=================================== +========================= +Pike Series Release Notes +========================= .. release-notes:: :branch: stable/pike diff --git a/releasenotes/source/queens.rst b/releasenotes/source/queens.rst index 36ac6160..3e124383 100644 --- a/releasenotes/source/queens.rst +++ b/releasenotes/source/queens.rst @@ -1,6 +1,6 @@ -=================================== - Queens Series Release Notes -=================================== +=========================== +Queens Series Release Notes +=========================== .. release-notes:: :branch: stable/queens diff --git a/releasenotes/source/stein.rst b/releasenotes/source/stein.rst index efaceb66..6b7e7250 100644 --- a/releasenotes/source/stein.rst +++ b/releasenotes/source/stein.rst @@ -1,6 +1,6 @@ -=================================== - Stein Series Release Notes -=================================== +========================== +Stein Series Release Notes +========================== .. release-notes:: :branch: stable/stein diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst index cd22aabc..875030f9 100644 --- a/releasenotes/source/unreleased.rst +++ b/releasenotes/source/unreleased.rst @@ -1,5 +1,5 @@ -============================== - Current Series Release Notes -============================== +============================ +Current Series Release Notes +============================ .. release-notes::