From patchwork Tue Oct 24 09:56:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Howard X-Patchwork-Id: 738045 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D761C25B48 for ; Tue, 24 Oct 2023 09:56:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233988AbjJXJ4T (ORCPT ); Tue, 24 Oct 2023 05:56:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234201AbjJXJ4S (ORCPT ); Tue, 24 Oct 2023 05:56:18 -0400 Received: from mail-lf1-x166.google.com (mail-lf1-x166.google.com [IPv6:2a00:1450:4864:20::166]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 214D8F9 for ; Tue, 24 Oct 2023 02:56:15 -0700 (PDT) Received: by mail-lf1-x166.google.com with SMTP id 2adb3069b0e04-507a55302e0so5778249e87.0 for ; Tue, 24 Oct 2023 02:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gadgetoid.com; s=google; t=1698141373; x=1698746173; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h5F3kZrJu7Ynl/mFHmp7ZA7oVuY86UDbMlGEs1+b0oQ=; b=hJrNUE/DRrvQ5Ouxl945UUAQ5m4EbV5D/f+LQlrO+DyAEyEu2bPeucmJG9ycePmsEc o2SEYYDKmZ3LKfrTOiF2pK3TgRGrjBCrNs2JrJbcs6MlK1O+Y8XrywhGyXGAINrYoAFw 0SMacN6WiSktxMDFn9RyWylk+BGIiN37kychdhbyOWn7Vvlowu4k98eirTx29NX5iI32 rO4r333HtH4g/5ex/1xq0PW/quhBo3ZWhLyguO716mCOIh31kQKrZNmcigXz8SR3W4+x JWkafxZSUV99AsGol+8mNnJTL4M6wlORj7+EWrWoDPfr4pF5JDndFeOsex2Nju+okz3l moag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698141373; x=1698746173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h5F3kZrJu7Ynl/mFHmp7ZA7oVuY86UDbMlGEs1+b0oQ=; b=fyQJTUB6KDgE9VQc9goGb1HvtpuZyjhLZchSfWEJ6kFr5/r2aeMnA2YPRbLWByDT9q VpnKv6ReEqWxe7oJqAixDCp0FidbHU1PoxQfSA0QPMwXZIuS2QOeXTYhYPHLTqosHss1 +hvRu8z0naLEaVhWo6V9vg0hh0RHCCwQpwATjqEg+3ha2NYtcDnh0PeInBn54LR+dhdD N3L5c6Og6CArttxfFp6F7CYb6/XXbFN60T3BUeWIsGt0pQadegD0YzCeOTVWb5adabGN mV7eM0hkFMgfAxvvDi2Txuy+5pSFpdhyzNEsulP2zJqaQ2crZOCXyO71fRigrf2fqeeT R11w== X-Gm-Message-State: AOJu0Yzdzmse9w5x+da+iOrNLeIvuEB/0MBaPi9HBGW7WwDDphnZr5v1 e+KtFz0Jk3/h6dGdNCsqW/lqVvtivmHUvddpHLTfViNpx2FIOA== X-Google-Smtp-Source: AGHT+IG57+cTrkcmSG0Qj7UpMkSNckGwwZkBgnlSKpEnVzhb4ffXN5hgTuhYCdAHjTO0RrvVeJGtuZCfFAMJ X-Received: by 2002:a05:6512:618:b0:507:bc6b:38a6 with SMTP id b24-20020a056512061800b00507bc6b38a6mr9153080lfe.33.1698141372497; Tue, 24 Oct 2023 02:56:12 -0700 (PDT) Received: from pop-os.. (cpc91242-cmbg18-2-0-cust972.5-4.cable.virginm.net. [82.8.131.205]) by smtp-relay.gmail.com with ESMTPS id d1-20020a0565123d0100b00507b8d9c7f2sm928844lfv.91.2023.10.24.02.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 02:56:12 -0700 (PDT) X-Relaying-Domain: gadgetoid.com From: Phil Howard To: Linus Walleij , Andy Shevchenko , Kent Gibson , Bartosz Golaszewski Cc: linux-gpio@vger.kernel.org, Phil Howard Subject: [libgpiod][PATCH v7 1/1] bindings: python: optionally include module in sdist Date: Tue, 24 Oct 2023 10:56:05 +0100 Message-Id: <20231024095605.713554-2-phil@gadgetoid.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024095605.713554-1-phil@gadgetoid.com> References: <20231024095605.713554-1-phil@gadgetoid.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Optionally vendor libgpiod source into sdist so that the Python module can be built from source, even with a missing or mismatched system libgpiod. Add two new environment variables "LINK_SYSTEM_LIBGPIOD" and "GPIOD_VERSION" to control what kind of package setup.py will build. In order to build an sdist or wheel package with a vendored libgpiod a version must be specified via the "GPIOD_VERSION" environment variable. This will instruct setup.py to verify the given version against the list in sha256sums.asc and ensure it meets or exceeds a GPIOD_MINIMUM_VERSION required for compatibility with the bindings. It will then fetch the tarball matching the requested version from mirrors.edge.kernel.org, verify the sha256 signature, unpack it, and copy the lib and include directories into the package root so they can be included in sdist or used to build a binary wheel. eg: GPIOD_VERSION=2.1.0 python3 setup.py sdist Will build a source distribution with gpiod version 2.1.0 source included. It will also save the gpiod version into "gpiod-version.txt" so that it can be passed to the build when the sdist is built by pip. Requiring an explicit version ensures that the Python bindings - which can be changed and versions independent of libgpiod - are built against a stable libgpiod release. In order to force a package with vendored gpiod source to link the system libgpiod, the "LINK_SYSTEM_LIBGPIOD" environment variable can be used: eg: LINK_SYSTEM_LIBGPIOD=1 pip install libgpiod Signed-off-by: Phil Howard --- bindings/python/MANIFEST.in | 5 + bindings/python/pyproject.toml | 2 +- bindings/python/setup.py | 196 +++++++++++++++++++++++++++++++-- 3 files changed, 191 insertions(+), 12 deletions(-) diff --git a/bindings/python/MANIFEST.in b/bindings/python/MANIFEST.in index 459b317..66fe9b8 100644 --- a/bindings/python/MANIFEST.in +++ b/bindings/python/MANIFEST.in @@ -3,6 +3,7 @@ include setup.py include README.md +include gpiod-version.txt recursive-include gpiod *.py recursive-include tests *.py @@ -12,3 +13,7 @@ recursive-include gpiod/ext *.h recursive-include tests/gpiosim *.c recursive-include tests/procname *.c + +recursive-include lib *.c +recursive-include lib *.h +recursive-include include *.h diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index fcf6bbe..f6bf43c 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -2,4 +2,4 @@ # SPDX-FileCopyrightText: 2023 Phil Howard [build-system] -requires = ["setuptools", "wheel"] +requires = ["setuptools", "wheel", "packaging"] diff --git a/bindings/python/setup.py b/bindings/python/setup.py index c8db0a0..ac8b241 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -1,24 +1,201 @@ # SPDX-License-Identifier: GPL-2.0-or-later # SPDX-FileCopyrightText: 2022 Bartosz Golaszewski -from os import environ, path -from setuptools import setup, Extension, find_packages +from os import getenv, path, unlink +from shutil import copytree, rmtree + +from setuptools import Extension, find_packages, setup from setuptools.command.build_ext import build_ext as orig_build_ext -from shutil import rmtree +from setuptools.command.sdist import log +from setuptools.command.sdist import sdist as orig_sdist +from setuptools.errors import BaseError + +LINK_SYSTEM_LIBGPIOD = getenv("LINK_SYSTEM_LIBGPIOD") == "1" +GPIOD_MINIMUM_VERSION = "2.1.0" +GPIOD_VERSION = getenv("GPIOD_VERSION") +GPIOD_WITH_TESTS = getenv("GPIOD_WITH_TESTS") == "1" +SRC_BASE_URL = "https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/" +TAR_FILENAME = "libgpiod-{version}.tar.gz" +ASC_FILENAME = "sha256sums.asc" +SHA256_CHUNK_SIZE = 2048 + +# __version__ +with open("gpiod/version.py", "r") as fd: + exec(fd.read()) + + +def sha256(filename): + """ + Return a sha256sum for a specific filename, loading the file in chunks + to avoid potentially excessive memory use. + """ + from hashlib import sha256 + + sha256sum = sha256() + with open(filename, "rb") as f: + for chunk in iter(lambda: f.read(SHA256_CHUNK_SIZE), b""): + sha256sum.update(chunk) + + return sha256sum.hexdigest() + + +def find_sha256sum(asc_file, tar_filename): + """ + Search through a local copy of sha256sums.asc for a specific filename + and return the associated sha256 sum. + """ + with open(asc_file, "r") as f: + for line in f: + if line[66:-1] == tar_filename: + return line.split(" ")[0] + + raise BaseError(f"no signature found for {tar_filename}") + + +def fetch_tarball(command): + """ + Verify the requested GPIOD_VERSION tarball exists in sha256sums.asc, + fetch it from https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/ + and verify its sha256sum. + + If the check passes, extract the tarball and copy the lib and include + dirs into our source tree. + """ + + # If no GPIOD_VERSION is specified in env, just run the command + if GPIOD_VERSION is None: + return command + + # If GPIOD_VERSION is specified, apply the tarball wrapper + def wrapper(self): + # Just-in-time import of tarfile and urllib.request so these are + # not required for Yocto to build a vendored or linked package + import tarfile + from tempfile import TemporaryDirectory + from urllib.request import urlretrieve + + from packaging.version import Version + + # Early exit for build tree with dirty lib/include dirs + for check_dir in "lib", "include": + if path.isdir(f"./{check_dir}"): + raise BaseError(f"refusing to overwrite ./{check_dir}") + + with TemporaryDirectory(prefix="libgpiod-") as temp_dir: + tarball_filename = TAR_FILENAME.format(version=GPIOD_VERSION) + tarball_url = f"{SRC_BASE_URL}{tarball_filename}" + asc_url = f"{SRC_BASE_URL}{ASC_FILENAME}" + + log.info(f"fetching: {asc_url}") + + asc_filename, _ = urlretrieve(asc_url, path.join(temp_dir, ASC_FILENAME)) + + tarball_sha256 = find_sha256sum(asc_filename, tarball_filename) + + if Version(GPIOD_VERSION) < Version(GPIOD_MINIMUM_VERSION): + raise BaseError(f"requires gpiod>={GPIOD_MINIMUM_VERSION}") + + log.info(f"fetching: {tarball_url}") + + downloaded_tarball, _ = urlretrieve( + tarball_url, path.join(temp_dir, tarball_filename) + ) + + log.info(f"verifying: {tarball_filename}") + if sha256(downloaded_tarball) != tarball_sha256: + raise BaseError(f"signature mismatch for {tarball_filename}") + + # Unpack the downloaded tarball + log.info(f"unpacking: {tarball_filename}") + with tarfile.open(downloaded_tarball) as f: + f.extractall(temp_dir) + + # Copy the include and lib directories we need to build libgpiod + base_dir = path.join(temp_dir, f"libgpiod-{GPIOD_VERSION}") + copytree(path.join(base_dir, "include"), "./include") + copytree(path.join(base_dir, "lib"), "./lib") + + # Save the gpiod version for sdist + open("gpiod-version.txt", "w").write(GPIOD_VERSION) + + # Run the command + command(self) + + # Clean up the build directory + rmtree("./lib", ignore_errors=True) + rmtree("./include", ignore_errors=True) + unlink("gpiod-version.txt") + + return wrapper class build_ext(orig_build_ext): """ - setuptools install all C extentions even if they're excluded in setup(). - As a workaround - remove the tests directory right after all extensions - were built (and possibly copied to the source directory if inplace is set). + Wrap build_ext to amend the module sources and settings to build + the bindings and gpiod into a combined module when a version is + specified and LINK_SYSTEM_LIBGPIOD=1 is not present in env. + + run is wrapped with @fetch_tarball in order to fetch the sources + needed to build binary wheels when GPIOD_VERSION is specified, eg: + + GPIOD_VERSION="2.0.2" python3 -m build . """ + @fetch_tarball def run(self): + # Try to get the gpiod version from the .txt file included in sdist + try: + gpiod_version = open("gpiod-version.txt", "r").read() + except OSError: + gpiod_version = GPIOD_VERSION + + if gpiod_version and not LINK_SYSTEM_LIBGPIOD: + # When building the extension from an sdist with a vendored + # amend gpiod._ext sources and settings accordingly. + gpiod_ext = self.ext_map["gpiod._ext"] + gpiod_ext.sources += [ + "lib/chip.c", + "lib/chip-info.c", + "lib/edge-event.c", + "lib/info-event.c", + "lib/internal.c", + "lib/line-config.c", + "lib/line-info.c", + "lib/line-request.c", + "lib/line-settings.c", + "lib/misc.c", + "lib/request-config.c", + ] + gpiod_ext.libraries = [] + gpiod_ext.include_dirs = ["include", "lib", "gpiod/ext"] + gpiod_ext.extra_compile_args.append( + f'-DGPIOD_VERSION_STR="{gpiod_version}"', + ) + super().run() + + # We don't ever want the module tests directory in our package + # since this might include gpiosim._ext or procname._ext from a + # previous dirty build tree. rmtree(path.join(self.build_lib, "tests"), ignore_errors=True) +class sdist(orig_sdist): + """ + Wrap sdist in order to fetch the libgpiod source files for vendoring + into a source distribution. + + run is wrapped with @fetch_tarball in order to fetch the sources + needed to build binary wheels when GPIOD_VERSION is specified, eg: + + GPIOD_VERSION="2.0.2" python3 -m build . --sdist + """ + + @fetch_tarball + def run(self): + super().run() + + gpiod_ext = Extension( "gpiod._ext", sources=[ @@ -50,19 +227,16 @@ procname_ext = Extension( ) extensions = [gpiod_ext] -if environ.get("GPIOD_WITH_TESTS") == "1": +if GPIOD_WITH_TESTS: extensions.append(gpiosim_ext) extensions.append(procname_ext) -with open("gpiod/version.py", "r") as fd: - exec(fd.read()) - setup( name="gpiod", packages=find_packages(exclude=["tests", "tests.*"]), python_requires=">=3.9.0", ext_modules=extensions, - cmdclass={"build_ext": build_ext}, + cmdclass={"build_ext": build_ext, "sdist": sdist}, version=__version__, author="Bartosz Golaszewski", author_email="brgl@bgdev.pl",