diff --git a/collect/cleanup/remove_envs.py b/collect/cleanup/remove_envs.py index 3fd130a6..d19ea8de 100644 --- a/collect/cleanup/remove_envs.py +++ b/collect/cleanup/remove_envs.py @@ -69,7 +69,7 @@ def remove_environment(env_name, prefix): args = parser.parse_args() # Remove conda environments with a specific prefix - conda_source = "source " + os.path.join(args.conda_path, "etc/profile.d/conda.sh") + conda_source = ". " + os.path.join(args.conda_path, "etc/profile.d/conda.sh") check_env = conda_source + " && " + "conda env list" try: conda_envs = subprocess.run(check_env.split(" "), check=True, capture_output=True) diff --git a/harness/context_manager.py b/harness/context_manager.py index 923c98e9..b42847ee 100644 --- a/harness/context_manager.py +++ b/harness/context_manager.py @@ -281,7 +281,7 @@ def __enter__(self): # Install dependencies path_to_reqs = get_requirements(setup_ref_instance, self.testbed) - cmd = f"source {path_activate} {env_name} && echo 'activate successful' && pip install -r {path_to_reqs}" + cmd = f". {path_activate} {env_name} && echo 'activate successful' && pip install -r {path_to_reqs}" logger_testbed.info( f"[Testbed] Installing dependencies for {env_name}; Command: {cmd}" ) @@ -326,7 +326,7 @@ def __enter__(self): # Install additional packages if specified if "pip_packages" in install: - cmd = f"source {path_activate} {env_name} && pip install {install['pip_packages']}" + cmd = f". {path_activate} {env_name} && pip install {install['pip_packages']}" logger_testbed.info( f"[Testbed] Installing pip packages for {env_name}; Command: {cmd}" ) @@ -436,10 +436,7 @@ def __init__( ) self.log_file = os.path.join(log_dir, log_file_name) - self.cmd_activate = ( - f"source {os.path.join(self.conda_path, 'bin', 'activate')} " - + f"{self.venv} && echo 'activate successful'" - ) + self.cmd_activate = f". {os.path.join(self.conda_path, 'bin', 'activate')} {self.venv} && echo 'activate successful'" self.timeout = timeout shellenv = os.environ.copy() diff --git a/versioning/get_versions.py b/versioning/get_versions.py index f10d6d78..24ba2906 100644 --- a/versioning/get_versions.py +++ b/versioning/get_versions.py @@ -140,8 +140,8 @@ def get_versions_from_build(data: Dict): data["save_path"], ) # Activate conda environment and set installation command - cmd_activate = f"source {os.path.join(path_conda, 'bin/activate')}" - cmd_source = f"source {os.path.join(path_conda, 'etc/profile.d/conda.sh')}" + cmd_activate = f". {os.path.join(path_conda, 'bin/activate')}" + cmd_source = f". {os.path.join(path_conda, 'etc/profile.d/conda.sh')}" cmd_install = INSTALL_CMD[data_tasks[0]["repo"]] # Change directory to repo testbed