From d1820d14c67bc178890a8889af5735da69c5e698 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 28 Jun 2018 16:10:03 +0100 Subject: [PATCH] Revert "docs: Disable smartquotes" Bump the minimum version of oslo.config to 6.1.0, which adds proper support for parsing Opt.help as rST [1]. This in turn allows us to revert commit 75fc30090133c31316e6ae790568f1b622807d0c, which is a temporary fix relying on deprecated features of Sphinx. [1] https://review.openstack.org/#/c/553860/ Change-Id: I8f56bdce37cfc538348490052a24e463164c86a3 --- doc/source/conf.py | 4 ---- lower-constraints.txt | 2 +- requirements.txt | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 96557403fe..4325e58ebe 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -159,10 +159,6 @@ html_extra_path = ['_extra'] # using the given strftime format. html_last_updated_fmt = '%Y-%m-%d %H:%M' -# Disable smartquotes to ensure all quoted example config options can be copied -# from the docs without later causing unicode errors within Nova. -html_use_smartypants = False - # -- Options for LaTeX output ------------------------------------------------- # Grouping the document tree into LaTeX files. List of tuples diff --git a/lower-constraints.txt b/lower-constraints.txt index 9f1d6e86fa..4ca91c9545 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -76,7 +76,7 @@ os-xenapi==0.3.3 osc-lib==1.10.0 oslo.cache==1.26.0 oslo.concurrency==3.26.0 -oslo.config==5.2.0 +oslo.config==6.1.0 oslo.context==2.19.2 oslo.db==4.27.0 oslo.i18n==3.15.3 diff --git a/requirements.txt b/requirements.txt index 746f6831c4..caf58dcbdd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2. websockify>=0.8.0 # LGPLv3 oslo.cache>=1.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 -oslo.config>=5.2.0 # Apache-2.0 +oslo.config>=6.1.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0