From dd0faaf614774b2454bbb57d428ddc4c9436d581 Mon Sep 17 00:00:00 2001
From: Alex Domingo <alex.domingo.toro@vub.be>
Date: Thu, 30 Jan 2025 12:03:41 +0100
Subject: [PATCH] use vsc-sofwtare-stack repo in root of active virtual
 environment

---
 bin/submit_build.py        | 27 ++++++++++++++++++---------
 src/build_tools/package.py |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/bin/submit_build.py b/bin/submit_build.py
index b8f207b..3a80e32 100755
--- a/bin/submit_build.py
+++ b/bin/submit_build.py
@@ -24,20 +24,33 @@
 import sys
 
 from vsc.utils import fancylogger
-from vsc.utils.script_tools import SimpleOption
 from vsc.utils.run import RunNoShell
+from vsc.utils.script_tools import SimpleOption
 
+from build_tools import hooks_hydra
 from build_tools.clusters import ARCHS, PARTITIONS
 from build_tools.filetools import APPS_BRUSSEL
-from build_tools import hooks_hydra
-from build_tools.hooks_hydra import (SUBDIR_MODULES_BWRAP, SUFFIX_MODULES_PATH, SUFFIX_MODULES_SYMLINK,
-                                     VALID_MODULES_SUBDIRS)
+from build_tools.hooks_hydra import (
+    SUBDIR_MODULES_BWRAP,
+    SUFFIX_MODULES_PATH,
+    SUFFIX_MODULES_SYMLINK,
+    VALID_MODULES_SUBDIRS,
+)
 from build_tools.lmodtools import submit_lmod_cache_job
 from build_tools.softinstall import mk_job_name, submit_build_job
 
+logger = fancylogger.getLogger()
+fancylogger.logToScreen(True)
+fancylogger.setLogLevelInfo()
 
 # repositories with easyconfigs
-VSCSOFTSTACK_ROOT = os.path.expanduser("~/vsc-software-stack")
+VSCSOFTSTACK_ROOT = os.path.join(os.path.dirname(os.getenv("VIRTUAL_ENV", "")), "vsc-software-stack")
+if not os.path.isdir(VSCSOFTSTACK_ROOT):
+    logger.error(
+        f"Cannot locate 'vsc-software-stack' repo in: {VSCSOFTSTACK_ROOT} "
+        "Please clone that repo in the parent folder of your virtual environment directory"
+    )
+    sys.exit(1)
 EASYCONFIG_REPOS = [
     # our site repo (https://github.com/vscentrum/vsc-software-stack/tree/site-vub)
     os.path.join("site-vub", "easyconfigs"),
@@ -46,10 +59,6 @@
 ]
 EASYBLOCK_REPO = os.path.join("site-vub", "easyblocks", "*", "*.py")
 
-logger = fancylogger.getLogger()
-fancylogger.logToScreen(True)
-fancylogger.setLogLevelInfo()
-
 DEFAULT_ARCHS = [arch for (arch, prop) in ARCHS.items() if prop['default']]
 LOCAL_ARCH = os.getenv('VSC_ARCH_LOCAL', '') + os.getenv('VSC_ARCH_SUFFIX', '')
 if LOCAL_ARCH not in ARCHS:
diff --git a/src/build_tools/package.py b/src/build_tools/package.py
index 0c5b485..54edb40 100644
--- a/src/build_tools/package.py
+++ b/src/build_tools/package.py
@@ -16,7 +16,7 @@
 @author: Alex Domingo (Vrije Universiteit Brussel)
 """
 
-VERSION = '4.0.2'
+VERSION = '4.0.3'
 
 AUTHOR = {
     'wp': 'Ward Poelmans',