From 40de48779540234062e27969286b06dafe3618eb Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 30 Mar 2024 13:14:29 +0530 Subject: [PATCH] Fix sequencing of imports in manual build scripts --- manual/build.py | 3 +-- manual/conf.py | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/manual/build.py b/manual/build.py index 0fdfb90d3a..f90eaf7b7a 100755 --- a/manual/build.py +++ b/manual/build.py @@ -17,11 +17,10 @@ BASE = d(a(__file__)) SPHINX_BUILD = ['sphinx-build'] sys.path.insert(0, d(BASE)) -from calibre.ebooks.oeb.polish.container import epub_to_azw3 - from setup import __appname__, __version__ sys.path.remove(d(BASE)) +from calibre.ebooks.oeb.polish.container import epub_to_azw3 def sphinx_build(language, base, builder='html', bdir='html', t=None, quiet=True, very_quiet=False): diff --git a/manual/conf.py b/manual/conf.py index 966de55a2e..05ab824178 100644 --- a/manual/conf.py +++ b/manual/conf.py @@ -18,15 +18,17 @@ from datetime import date # If your extensions are in another directory, add it here. base = os.path.dirname(os.path.abspath(__file__)) -sys.path.append(base) sys.path.insert(0, os.path.dirname(base)) +from setup import __appname__, __version__ + +sys.path.append(base) + import calibre.utils.img as cimg import custom from calibre.utils.localization import localize_website_link -from setup import __appname__, __version__ - del sys.path[0] + custom, cimg # General configuration # ---------------------