[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62202] [PATCH 11/21] import: juliahub: Improve test dependencies pa
From: |
Nicolas Graves |
Subject: |
[bug#62202] [PATCH 11/21] import: juliahub: Improve test dependencies parsing. |
Date: |
Wed, 15 Mar 2023 13:51:20 +0100 |
---
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 5327e92325..2ea461b72a 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 <juliahub-package> 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
--
2.39.2
- [bug#62202] [PATCH 0/21] Juliahub import script., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 01/21] import: juliahub: first script draft., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 02/21] import: utils: Change git->origin function to git->origin+version., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 04/21] import: juliahub: Correct source parsing., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 03/21] import: juliahub: Add support for native-inputs., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 11/21] import: juliahub: Improve test dependencies parsing.,
Nicolas Graves <=
- [bug#62202] [PATCH 09/21] import: juliahub: Improve dependency management., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 06/21] import: juliahub: Add updater and recursive-importer., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 05/21] import: juliahub: Add indirect dependencies., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 08/21] import: juliahub: Simplify juliahub dependency management., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 10/21] import: juliahub: Add functions to parse the git repo for a git tag., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 07/21] import: juliahub: Filter out julia stdlibs., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 12/21] import: juliahub: Handle the case where we have a subdirectory., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 13/21] import: juliahub: Add support for versions for juliahub-fetch., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 16/21] import: juliahub: Beautify description., Nicolas Graves, 2023/03/15
- [bug#62202] [PATCH 18/21] import: juliahub: Fix version management., Nicolas Graves, 2023/03/15