From b8103b439491e74b7bbbcae20df47cdc0ef178ef Mon Sep 17 00:00:00 2001 From: ljhuang Date: Tue, 11 Jun 2019 10:02:18 +0000 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: I2ab509a8430cb3e7d297bd4303a492c21d59a7f3 --- doc/requirements.txt | 7 ++++++- doc/source/conf.py | 2 +- releasenotes/source/conf.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 54caed14..6a7ab091 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,9 @@ -sphinx>=1.6.2,!=1.6.6,!=1.6.7 # 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. + +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>=1.3.0 # BSD sphinxcontrib-pecanwsme>=0.2 # Apache-2.0 sphinxcontrib-seqdiag>=0.8.4 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 9f0bfa4b..03bacab5 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -98,4 +98,4 @@ latex_documents = [ ] # Example configuration for intersphinx: refer to the Python standard library. -#intersphinx_mapping = {'http://docs.python.org/': None} +#intersphinx_mapping = {'https://docs.python.org/': None} diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index d7400c49..9c78bf0f 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -87,7 +87,7 @@ html_last_updated_fmt = '%Y-%m-%d %H:%M' # to template names. # # This is required for the alabaster theme -# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars +# refs: https://alabaster.readthedocs.io/en/latest/installation.html#sidebars # html_sidebars = {}