From patchwork Wed Mar 15 12:51:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 11037 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 17C7916C76; Wed, 15 Mar 2023 12:54:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 1100F16961 for ; Wed, 15 Mar 2023 12:54:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQdD-0004DF-Cv; Wed, 15 Mar 2023 08:53:27 -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 1pcQco-0003vn-Ol for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcQco-0003Lu-Dy for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQco-0001d9-97 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 15/21] import: juliahub: More robust toml regex parser. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 12:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16788847336138 (code B ref 62202); Wed, 15 Mar 2023 12:53:02 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:52:13 +0000 Received: from localhost ([127.0.0.1]:39348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQc0-0001ap-SH for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:13 -0400 Received: from 8.mo575.mail-out.ovh.net ([46.105.74.219]:40835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbu-0001ZR-W3 for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:08 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.4.183]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 9F21424BE2 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:52:05 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-qw29x (unknown [10.111.208.12]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0F2161FEA5; Wed, 15 Mar 2023 12:52:04 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-qw29x with ESMTPSA id JraRMXS/EWR/yAAA3vnIvw (envelope-from ); Wed, 15 Mar 2023 12:52:04 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0052aebf83f-b331-447d-94ff-fa4c67c92dfa, F74D9BBE9ED44B45FF66447495DD0B0753EB5D4A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:24 +0100 Message-Id: <20230315125130.23041-15-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315125130.23041-1-ngraves@ngraves.fr> References: <20230315125130.23041-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13795933034247152354 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvddtfeeuueehgfduffehgedtlefguefggedvgfevjeeikeeuvdetgeeuudeltdefnecuffhomhgrihhnpehjuhhlihgrhhhusgdrohhrghenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedvvddtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 --- guix/import/juliahub.scm | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 1c7b029296..3985d8d0be 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -154,28 +154,15 @@ (define (json->juliahub-dependencies vector) #f))) (vector->list vector)))) -(define (ini-list->test-dependencies lst) - (match lst - (('test '= ooo ...) - `(,(caar ooo) ,@(test-list->test-dependencies (cdar ooo)))) - ((value ooo ...) - (ini-list->test-dependencies ooo)) - ('() - '()))) - -(define (test-list->test-dependencies lst) - (match lst - ((('unquote value) ooo ...) - `(,value ,@(test-list->test-dependencies ooo))) - ('() - '()))) - (define (parse-test-dependencies directory) (let* ((port (open-input-file (string-append directory "/Project.toml"))) - (ini-list (stream->list (port->stream port read)))) + (project.toml (get-string-all port)) + (regex "\ntest = \\[.*\\]") + (deps (match:substring (string-match regex project.toml))) + (pure (string-delete (list->char-set (list #\" #\ )) deps))) (close-port port) (filter (lambda (x) (not (member x %julia-stdlibs))) - (ini-list->test-dependencies ini-list)))) + (string-split (string-drop (string-drop-right pure 1) 7) #\,)))) ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? @@ -243,9 +230,9 @@ (define* (juliahub->guix-package package-name "Fetch the metadata for PACKAGE-NAME from juliahub.org, and return the `package' s-expression corresponding to that package, or #f on failure. Optionally include a VERSION string to fetch a specific version juliahub." - (let* ((package-toml (ini-fetch (general-url package-name "Package.toml"))) - (subdir (assoc-ref package-toml 'subdir)) - (tag (latest-git-tag (assoc-ref package-toml 'repo))) + (let* ((package.toml (ini-fetch (general-url package-name "Package.toml"))) + (subdir (assoc-ref package.toml 'subdir)) + (tag (latest-git-tag (assoc-ref package.toml 'repo))) (package (if version (juliahub-fetch package-name #:version version) (if tag