[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Pki-devel] More Fedora 24 fixes



On 2016-02-29 09:57, Christian Heimes wrote:
> Hi,
> 
> I've attached four patches that address various problems on Fedora 24.
> 
> Patch 0052 enables proper error handling in sphinx-build. Right now
> sphinx-build only warns about errors but doesn't signal errors in its
> exit code. The -W turns warnings (such as a failed import) into a
> non-zero exit code.
> 
> Patch 0053 addresses new packages such as Python 3.5 and pylint 1.5.
> 
> Patch 0054 fixes a linter error in pki.cli.pkcs12.
> 
> The last patch sets the sphinx theme to the old classic theme.

patch 0055 breaks sphinx on Fedora 23. The new patch keeps the default
scheme for sphinx < 1.3.

Christian
From 23ae08f1f6af816752e95bac2f4ff17f84a465e8 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes redhat com>
Date: Mon, 29 Feb 2016 09:47:39 +0100
Subject: [PATCH] Sphinx 1.3 has renamed the default scheme

Use html_theme = 'classic' on sphinx 1.3 to silence this warning:

WARNING: 'default' html theme has been renamed to 'classic'. Please
change your html_theme setting either to the new 'alabaster' default
theme, or to 'classic' to keep using the old default.
---
 base/common/python/conf.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/base/common/python/conf.py b/base/common/python/conf.py
index f076cf919b1c2718a439ca5aca56002bb4f74ccf..3e548147ea9b3c3928100e0f2dd0623a9bd68c02 100644
--- a/base/common/python/conf.py
+++ b/base/common/python/conf.py
@@ -14,6 +14,7 @@
 from __future__ import absolute_import
 import sys
 import os
+import sphinx
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -93,7 +94,10 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+if sphinx.version_info < (1, 3):
+    html_theme = 'default'
+else:
+    html_theme = 'classic'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
-- 
2.5.0

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]