From f3ffbb4dce38b0c7430dfd6c02fc28760557a63d Mon Sep 17 00:00:00 2001 From: jacky06 Date: Tue, 18 Jun 2019 22:09:35 +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: I24cb8d8d084a291028a961823fcac4f09b4bf1ca --- README.rst | 6 ++---- doc/requirements.txt | 7 ++++++- setup.cfg | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 7c67bcb72..03013c758 100644 --- a/README.rst +++ b/README.rst @@ -8,9 +8,7 @@ Documentation for the project can be found at: https://docs.openstack.org/aodh/latest/ The project home is at: - https://launchpad.net/aodh + https://storyboard.openstack.org/#!/project/openstack/aodh Bugs and feature requests are tracked on Launchpad at: - - https://bugs.launchpad.net/aodh - + https://storyboard.openstack.org/#!/project/openstack/aodh diff --git a/doc/requirements.txt b/doc/requirements.txt index 2d7edea9e..63659fbc3 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,5 +1,10 @@ +# 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. + openstackdocstheme>=1.11.0 # Apache-2.0 reno>=0.1.1 # Apache2 -sphinx>=1.6.2 +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 sphinxcontrib-httpdomain sphinxcontrib-pecanwsme>=0.8 diff --git a/setup.cfg b/setup.cfg index 9ca36fac3..cc57f7346 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = aodh -url = http://launchpad.net/aodh +url = https://storyboard.openstack.org/#!/project/openstack/aodh summary = OpenStack Telemetry Alarming description-file = README.rst