From 74bc28c48f7e91904b3aec27e6782b37d7f00c0a Mon Sep 17 00:00:00 2001 From: buehlere Date: Tue, 17 Mar 2026 15:53:05 -0400 Subject: [PATCH 1/3] use map for legacy app environments we need to specify a different execution environment for XS heme. --- ridgeback/settings.py | 14 +++++++++++--- submitter/toil_submitter/toil_jobsubmitter.py | 7 +++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ridgeback/settings.py b/ridgeback/settings.py index 666e1ae5..354a4927 100644 --- a/ridgeback/settings.py +++ b/ridgeback/settings.py @@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/2.2/ref/settings/ """ +import json import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -326,9 +327,16 @@ SKIP_THE_QUEUE_JOBS = ("ARGOS", "ACCESS_HEME", "ACCESS", "CMO-CH") # ACCESS LEGACY INFO -ACCESS_LEGACY_APP = os.environ.get("ACCESS_LEGACY_APP", "access-pipeline") -ACCESS_LEGACY_CONDA_ENV = os.environ.get( - "ACCESS_LEGACY_CONDA_ENV", "/usersoftware/core005/access/production/V1/micromamba/envs/ACCESS-voyager/bin" +ACCESS_LEGACY_APP_ENV_MAP = json.loads( + os.environ.get( + "ACCESS_LEGACY_APP_ENV_MAP", + json.dumps( + { + "access-pipeline": "/usersoftware/core005/access/production/V1/micromamba/envs/ACCESS-voyager/bin", + "access_heme": "/usersoftware/core005/accessH/development/envs/ACCESS-HEME-voyager/bin" + } + ), + ) ) SHELL_PLUS = "ipython" diff --git a/submitter/toil_submitter/toil_jobsubmitter.py b/submitter/toil_submitter/toil_jobsubmitter.py index bffa2ace..b64f7eda 100644 --- a/submitter/toil_submitter/toil_jobsubmitter.py +++ b/submitter/toil_submitter/toil_jobsubmitter.py @@ -89,8 +89,11 @@ def get_submit_command(self): env["TMP"] = self.job_tmp_dir env["TMPDIR"] = self.job_tmp_dir env[self.batch_system_args_env] = toil_batch_system_args.strip() - if settings.ACCESS_LEGACY_APP in self.app.github.lower(): - env["PATH"] = f"{settings.ACCESS_LEGACY_CONDA_ENV}:{os.environ.get('PATH')}" + github_lower = self.app.github.lower() + for app_key, conda_env in settings.ACCESS_LEGACY_APP_ENV_MAP.items(): + if app_key in github_lower: + env["PATH"] = f"{conda_env}:{os.environ.get('PATH')}" + break return command_line, self._leader_args(), log_path, self.job_id, self.partition, env def get_commandline_status(self, cache): From a7948a1e89c6ced0f3bd6fe14292ff1970b3a015 Mon Sep 17 00:00:00 2001 From: buehlere Date: Tue, 17 Mar 2026 15:53:55 -0400 Subject: [PATCH 2/3] format --- ridgeback/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ridgeback/settings.py b/ridgeback/settings.py index 354a4927..29d88539 100644 --- a/ridgeback/settings.py +++ b/ridgeback/settings.py @@ -333,7 +333,7 @@ json.dumps( { "access-pipeline": "/usersoftware/core005/access/production/V1/micromamba/envs/ACCESS-voyager/bin", - "access_heme": "/usersoftware/core005/accessH/development/envs/ACCESS-HEME-voyager/bin" + "access_heme": "/usersoftware/core005/accessH/development/envs/ACCESS-HEME-voyager/bin", } ), ) From 545b14d4387648c948c52b73b0b4205dabce7bbd Mon Sep 17 00:00:00 2001 From: Sinisa Ivkovic Date: Thu, 19 Mar 2026 10:20:26 -0400 Subject: [PATCH 3/3] Version bump 2.1.0 --- ridgeback/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ridgeback/__init__.py b/ridgeback/__init__.py index 8c0d5d5b..9aa3f903 100644 --- a/ridgeback/__init__.py +++ b/ridgeback/__init__.py @@ -1 +1 @@ -__version__ = "2.0.0" +__version__ = "2.1.0"