From 78d0d84fd7300e934ca76fa6faa38536b8028125 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Fri, 21 Jan 2022 10:31:13 +0300
Subject: Use guix shell. Remove git commands

* Use guix shell rather than guix environment
* Use `GN_CI_DIR` set up at invocation
* Remove git commands
* Use `~/.config/guix/current/bin/guix` to take advantage of declared channels
---
 scripts/laminar/gn3-lint.run     | 10 +++-------
 scripts/laminar/gn3-mypy.run     | 11 ++++-------
 scripts/laminar/gn3-unittest.run | 11 ++++-------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/scripts/laminar/gn3-lint.run b/scripts/laminar/gn3-lint.run
index 2456740..edf37af 100755
--- a/scripts/laminar/gn3-lint.run
+++ b/scripts/laminar/gn3-lint.run
@@ -3,14 +3,10 @@
 set -ex  # Abort on first error
 
 CUR_DIR=$PWD
-GN3_CI_DIR=$HOME/CI/genenetwork3/
-
-cd $GN3_CI_DIR
-git pull
+cd "$GN3_CI_DIR"
 
 # Run Pylint
-env GUIX_PACKAGE_PATH="$HOME/guix-bioinformatics:$HOME/guix-past/modules" \
-    guix environment --load=guix.scm -- pylint sheepdog/worker.py gn3/ tests
+"${HOME}/.config/guix/current/bin/guix" shell --file=guix.scm -- pylint sheepdog/worker.py gn3/ tests
 
 echo Done Running Pylint!
-cd $CUR_DIR
+cd "$CUR_DIR"
diff --git a/scripts/laminar/gn3-mypy.run b/scripts/laminar/gn3-mypy.run
index 43f48e8..f92981b 100755
--- a/scripts/laminar/gn3-mypy.run
+++ b/scripts/laminar/gn3-mypy.run
@@ -1,15 +1,12 @@
 #!/bin/sh
 
 set -ex  # Abort on first error
-CUR_DIR=$PWD
-GN3_CI_DIR=$HOME/CI/genenetwork3/
 
-cd $GN3_CI_DIR
-git pull
+CUR_DIR=$PWD
+cd "$GN3_CI_DIR"
 
 # Run Pylint
-env GUIX_PACKAGE_PATH="$HOME/guix-bioinformatics:$HOME/guix-past/modules" \
-    guix environment --load=guix.scm -- mypy .
+"${HOME}/.config/guix/current/bin/guix" shell --file=guix.scm -- mypy .
 
 echo Done Running MyPy!
-cd $CUR_DIR
+cd "$CUR_DIR"
diff --git a/scripts/laminar/gn3-unittest.run b/scripts/laminar/gn3-unittest.run
index e6a65e5..4e0dc64 100755
--- a/scripts/laminar/gn3-unittest.run
+++ b/scripts/laminar/gn3-unittest.run
@@ -1,15 +1,12 @@
 #!/bin/sh
 
 set -ex  # Abort on first error
-CUR_DIR=$PWD
-GN3_CI_DIR=$HOME/CI/genenetwork3/
 
-cd $GN3_CI_DIR
-git pull
+CUR_DIR=$PWD
+cd "$GN3_CI_DIR"
 
 # Run Pylint
-env GUIX_PACKAGE_PATH="$HOME/guix-bioinformatics:$HOME/guix-past/modules" \
-    guix environment --load=guix.scm -- python -m unittest discover
+"${HOME}/.config/guix/current/bin/guix" shell --file=guix.scm -- python -m unittest discover tests.unit
 
 echo Done Running Unittests!
-cd $CUR_DIR
+cd "$CUR_DIR"
-- 
cgit v1.2.3