From e5c9ed4b80adf9742d6d43f2ab119de2a8fb2463 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 16 Apr 2024 23:34:25 +0200 Subject: [PATCH] Fix build errors for old Ubuntu LTSes --- pkgutils.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgutils.py b/pkgutils.py index fb6bf1b6..19152c41 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -780,19 +780,28 @@ def makeDebianPackage( )) print("Wrote: setup.py") - setupCfg = readFile("pyproject.toml").replace( - "setup/description_pypi.md", "data/description_short.txt" - ) - writeFile(f"{outDir}/pyproject.toml", setupCfg) - print("Wrote: pyproject.toml") - if oldSetuptools: + # This is needed for Ubuntu up to 22.04 setupCfg = readFile("setup/launchpad_setup.cfg").replace( "file: setup/description_pypi.md", "file: data/description_short.txt" ) writeFile(f"{outDir}/setup.cfg", setupCfg) print("Wrote: setup.cfg") + writeFile(f"{outDir}/pyproject.toml", ( + "[build-system]\n" + "requires = [\"setuptools\"]\n" + "build-backend = \"setuptools.build_meta\"\n" + )) + print("Wrote: pyproject.toml") + + else: + pyProject = readFile("pyproject.toml").replace( + "setup/description_pypi.md", "data/description_short.txt" + ) + writeFile(f"{outDir}/pyproject.toml", pyProject) + print("Wrote: pyproject.toml") + # Copy/Write Debian Files # ======================= @@ -877,7 +886,7 @@ def makeForLaunchpad(doSign: bool = False, isFirst: bool = False) -> None: print("Building Ubuntu packages for:") print("") - for distNum, codeName, oldSetup in distLoop: + for distNum, codeName, _ in distLoop: print(f" * Ubuntu {distNum} {codeName.title()}") print("")