From db3b1a5a40b1bc56abbba8970efcd75f7f1f50f9 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 16 Jan 2022 09:12:21 -0700 Subject: Fix rst2pdf/Sphinx problem a better way Our Sphinx config specifies the use of rst2pdf: extensions = [ ... 'rst2pdf.pdfbuilder', ... As of 0.99 we apparently need to declare a pdf stylesheet, even though we don't knowingly use that style. With that change, unpin rst2pdf again. Also upgrade lxml, leaving it pinned to a version with a comment why. Signed-off-by: Mats Wichmann --- doc/sphinx/conf.py | 4 ++++ requirements.txt | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index d6d0778..9db9095 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -59,6 +59,10 @@ napoleon_include_private_with_doc = True # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] +# Since 0.99, rst2pdf says: "twoColumn isn't part of the default styles +# in 0.99. You need to add the twocolumn style file." +pdf_stylesheets = ['twocolumn'] + # The suffix(es) of source filenames. # You can specify multiple suffix as a list of string: # diff --git a/requirements.txt b/requirements.txt index 9a7d638..1be070c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,9 +6,10 @@ readme-renderer sphinx sphinx_rtd_theme -# recent release causes problems, pin older: -rst2pdf==0.98 -lxml==4.6.5 +rst2pdf +# for now keep pinning "known working" lxml, +# it's been a troublesome component in the past. +lxml==4.7.1 rst2pdf ninja -- cgit v0.12