From patchwork Mon Sep 18 18:03:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54045 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1EF4C27BBEA; Mon, 18 Sep 2023 19:10:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4742A27BBE2 for ; Mon, 18 Sep 2023 19:10:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIeA-00067s-G2; Mon, 18 Sep 2023 14:06:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiIdJ-00059d-6U for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIdI-00045R-Mn for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdQ-0002WV-WF for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66089] [PATCH v2 13/23] DRAFT import: juliahub: Improve test dependencies parsing. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66089 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66089@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603639498 (code B ref -1); Mon, 18 Sep 2023 18:06:12 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:06:03 +0000 Received: from localhost ([127.0.0.1]:54483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIdG-0002Sq-Pg for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:06:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbe-0002Jd-Nn for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiIbD-0002Pj-9e for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb9-0003Ph-TT for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:54 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-404800222d2so8773795e9.0 for ; Mon, 18 Sep 2023 11:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060226; x=1695665026; darn=gnu.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=YXqL4K66ytKP24DRIGlGdAvLaLiYuD/871Y6ruKDXqQ=; b=LJO8igGzkryqy4xhMWVYAw3xVybkiADir25BKhGOdne981Bm1hrejD1GaNZVE+4W7Z COcYAfjBveynAPc31E53iHvuLPg4NHbtS9SOi/H89Km78NdgQn4B3q/nYxnU073A9t9O ZzPep+WPQBoFb7OsFPKJ/z7hP8xUioKILoM7MBLrHAIXT+DjM8cc99jHDup9vZOa8/Fx XYiedkuR3hJ2ERrceAuDNA/0cSvRq4sIZt781/262RnGAjCpbk/y8YvaTzZpg6orinAw 3BfFzQXAhSmU2DqalNKtPn/Cku5cp4DQQ1HV5q92KOQ4TIy7zGIW9kItasLNvPc0y0Kr Gsbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060226; x=1695665026; 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=YXqL4K66ytKP24DRIGlGdAvLaLiYuD/871Y6ruKDXqQ=; b=hzgp6uSkRnnu8cYzmTS/B+q2Lze+Fqmxhw+bXgKWKL8eEce7YWU7KpvjWzWMGYCBkx sAg+zu6QyvJWUiEH+pHJv8B6pkBI/qcy26b3K4olWESLEUF/xNefMRqR9Z4l1/PbK7jT V5aooZ1GUEUeT0RBzcbdLAC2/R8gunFIDQ8lAG1sijQK3thN4Axr6wDxPeWMf4jYCyds esQo8hLI76A/NXwoqM/OKpKLc/1PfyKXqs1BRXnLEUFF6MuL5l7uBfFdlfg+9O9F+P7j Vrxocs0/LYHoN3VYOHTOp4AAdy7Wa/EiM673fXCcVohRGrMwPi3Xz0utV+0og4/hFU2u vONQ== X-Gm-Message-State: AOJu0Yzu3oqhWlnpo4FGgU5CAHvgDaERvuAu1JK3F3nv0PwJA8tnyozs sA+FHJvD2vDgOOt9TQKIg60= X-Google-Smtp-Source: AGHT+IEQ1arr7j2r1YrsSfB+aA/7qxSqZoaNVcdHY5PC+lM01DE8qRa8ZAwPXzkg5T0JiMuf3eQogg== X-Received: by 2002:a05:600c:3d89:b0:401:c717:ec69 with SMTP id bi9-20020a05600c3d8900b00401c717ec69mr8974386wmb.4.1695060225959; Mon, 18 Sep 2023 11:03:45 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z2-20020adfd0c2000000b0030ada01ca78sm2210465wrh.10.2023.09.18.11.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:45 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:20 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Nicolas Graves via Guix-patches via Signed-off-by: Simon Tournier --- guix/import/juliahub.scm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 5327e923251d..2ea461b72aba 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -154,31 +154,27 @@ (define (json->juliahub-dependencies vector) #f))) (vector->list vector)))) -(define (ini-list->extra-dependencies lst) +(define (ini-list->test-dependencies lst) (match lst - (('(extras) ooo ...) - (extra-list->extra-dependencies ooo)) - (((tag) ooo ...) - (ini-list->extra-dependencies ooo)) - ((attribute '= value ooo ...) - (ini-list->extra-dependencies ooo)) + (('test '= ooo ...) + `(,(caar ooo) ,@(test-list->test-dependencies (cdar ooo)))) + ((value ooo ...) + (ini-list->test-dependencies ooo)) ('() - '()))) + '()))) -(define (extra-list->extra-dependencies lst) +(define (test-list->test-dependencies lst) (match lst - ((attribute '= value ooo ...) - `(,(symbol->string attribute) ,@(extra-list->extra-dependencies ooo))) - (((tag) ooo ...) - '()) + ((('unquote value) ooo ...) + `(,value ,@(test-list->test-dependencies ooo))) ('() - '()))) + '()))) -(define (parse-extra-dependencies directory) +(define (parse-test-dependencies directory) (let* ((port (open-input-file (string-append directory "/Project.toml"))) (ini-list (stream->list (port->stream port read)))) (close-port port) - (ini-list->extra-dependencies ini-list))) + (ini-list->test-dependencies ini-list))) ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? @@ -268,7 +264,7 @@ (define* (juliahub->guix-package package-name (licenses (map spdx-string->license (list (juliahub-package-license package)))) - (test-dependencies-names (parse-extra-dependencies directory))) + (test-dependencies-names (parse-test-dependencies directory))) (values (make-julia-sexp package-name source