From fb813b043bcdde9df80128c29cf45cc3987c9d09 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Tue, 19 Dec 2023 21:01:21 +0000
Subject: Use guix-channel-job-gexp for genenetwork3 pylint and mypy CI jobs.

* genenetwork-development.scm (genenetwork3-mypy,
genenetwork3-pylint): Delete variables.
(genenetwork-projects): Build only genenetwork3 variable in
genenetwork3 CI job. Combine genenetwork3-mypy and genenetwork3-pylint
CI jobs into a genenetwork3-all-tests job that uses
guix-channel-job-gexp.
* genenetwork/development-helper.scm (genenetwork3-lint-gexp): Delete
function.
---
 genenetwork-development.scm | 41 ++++++++++++-----------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'genenetwork-development.scm')

diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index c219c5c..fe2392b 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -223,23 +223,6 @@ command to be executed."
             (allow-collisions? #t))
          '#$tests-command))))
 
-(define genenetwork3-pylint
-  (with-imported-modules (source-module-closure '((genenetwork development-helper))
-                                                #:select? import-module?)
-    #~(lambda (genenetwork3-checkout)
-        ((@@ (genenetwork development-helper)
-             genenetwork3-lint-gexp)
-         genenetwork3-checkout
-         #$(profile
-            (content (manifest-cons* python-pylint shellcheck
-                                     (package->development-manifest genenetwork3)))
-            (allow-collisions? #t))))))
-
-(define genenetwork3-mypy
-  (genenetwork3-tests (list "mypy" ".")
-                      (manifest-cons python-mypy
-                                     (package->development-manifest genenetwork3))))
-
 (define gn-auth-pylint
   (with-imported-modules (source-module-closure '((genenetwork development-helper))
                                                 #:select? import-module?)
@@ -386,6 +369,9 @@ genenetwork3 source from the latest commit of @var{project}."
                                         (name 'genenetwork3)
                                         (url (forge-project-repository this-forge-project))
                                         (branch "main")))
+                                 #:variables (list (variable-specification
+                                                    (module '(genenetwork3-package))
+                                                    (name 'genenetwork3)))
                                  #:guix-daemon-uri %guix-daemon-uri))
 			   ;; If tests run successfully, redeploy
 			   ;; genenetwork3 and trigger genenetwork2 tests.
@@ -400,18 +386,15 @@ genenetwork3 source from the latest commit of @var{project}."
                                           (invoke #$(file-append laminar "/bin/laminarc")
                                                   "queue" "genenetwork2"))))))
                           (forge-laminar-job
-                           (name "genenetwork3-pylint")
-                           (run (derivation-job-gexp
-                                 this-forge-project
-                                 this-forge-laminar-job
-                                 genenetwork3-pylint
-                                 #:guix-daemon-uri %guix-daemon-uri)))
-                          (forge-laminar-job
-                           (name "genenetwork3-mypy")
-                           (run (derivation-job-gexp
-                                 this-forge-project
-                                 this-forge-laminar-job
-                                 genenetwork3-mypy
+                           (name "genenetwork3-all-tests")
+                           (run (guix-channel-job-gexp
+                                 (list (channel
+                                        (name 'genenetwork3)
+                                        (url (forge-project-repository this-forge-project))
+                                        (branch "main")))
+                                 #:variables (list (variable-specification
+                                                    (module '(genenetwork3-package))
+                                                    (name 'genenetwork3-all-tests)))
                                  #:guix-daemon-uri %guix-daemon-uri)))
                           (forge-laminar-job
                            (name "genenetwork3-build-xapian-index")
-- 
cgit v1.2.3