From 560945eb74404705bafbda624a54e0bd03b2ee77 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Thu, 1 Jun 2023 06:22:36 +0300 Subject: [PATCH] r-ps: fix build error ``` Traceback (most recent call last): File "/usr/lib/python3.11/site-packages/lilac2/worker.py", line 216, in main with load_lilac(Path('.')) as mod: File "/usr/lib/python3.11/contextlib.py", line 137, in __enter__ return next(self.gen) ^^^^^^^^^^^^^^ File "/usr/lib/python3.11/site-packages/lilac2/lilacpy.py", line 46, in load_lilac spec.loader.exec_module(mod) File "", line 940, in exec_module File "", line 241, in _call_with_frames_removed File "/usr/share/lilac/Packages/BioArchLinux/r-ps/lilac.py", line 7, in from lilac_r_utils import r_pre_build File "/usr/share/lilac/Packages/lilac-extensions/lilac_r_utils.py", line 2, in from lilaclib import _G, edit_file, run_protected ImportError: cannot import name '_G' from 'lilaclib' (/usr/lib/python3.11/site-packages/lilaclib.py) ``` --- BioArchLinux/r-fs/lilac.py | 1 + BioArchLinux/r-ps/lilac.py | 2 +- BioArchLinux/r-ps/lilac.yaml | 2 +- lilac-extensions/lilac_r_utils.py | 13 +++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/BioArchLinux/r-fs/lilac.py b/BioArchLinux/r-fs/lilac.py index aa659ce0f0..6cfc1b802b 100644 --- a/BioArchLinux/r-fs/lilac.py +++ b/BioArchLinux/r-fs/lilac.py @@ -8,6 +8,7 @@ from lilac_r_utils import r_pre_build def pre_build(): r_pre_build( + _G, expect_systemrequirements = "GNU make", ) diff --git a/BioArchLinux/r-ps/lilac.py b/BioArchLinux/r-ps/lilac.py index e6dd0c0e7c..b5cdb057c5 100644 --- a/BioArchLinux/r-ps/lilac.py +++ b/BioArchLinux/r-ps/lilac.py @@ -7,7 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build() + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-ps/lilac.yaml b/BioArchLinux/r-ps/lilac.yaml index 3735a274d5..79a579de52 100644 --- a/BioArchLinux/r-ps/lilac.yaml +++ b/BioArchLinux/r-ps/lilac.yaml @@ -6,4 +6,4 @@ update_on: cran: ps - alias: r - source: manual - manual: 1 + manual: 2 diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 248eb39ffe..d6c353c7fa 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -1,9 +1,10 @@ from lilac2.const import PACMAN_DB_DIR -from lilaclib import _G, edit_file, run_protected +from lilaclib import edit_file, run_protected import pyalpm import tarfile +from types import SimpleNamespace -def r_update_pkgver_and_pkgrel(): +def r_update_pkgver_and_pkgrel(_G: SimpleNamespace): """ Update _pkgver and pkgrel used in R packages. @@ -320,7 +321,7 @@ all_checks = [ check_arch, ] -def r_check_pkgbuild(cfg: CheckConfig): +def r_check_pkgbuild(_G: SimpleNamespace, cfg: CheckConfig): pkgbuild = Pkgbuild() cfg.default_r_pkgs = get_default_r_pkgs() errors = [] @@ -337,8 +338,8 @@ def r_check_pkgbuild(cfg: CheckConfig): errors = '\n'.join(errors) raise CheckFailed(f"Check failed:\n{errors}") -def r_pre_build(**kwargs): +def r_pre_build(_G: SimpleNamespace, **kwargs): cfg = CheckConfig(**kwargs) - r_update_pkgver_and_pkgrel() + r_update_pkgver_and_pkgrel(_G) run_protected(["updpkgsums"]) - r_check_pkgbuild(cfg) + r_check_pkgbuild(_G, cfg)