Skip to content

Commit e5b3936

Browse files
committed
'make_fastqs': make conda envs under analysis directory by default.
If the location for conda environments is not explicitly supplied or set in the configuration then default is now to create within the analysis directory.
1 parent 30db538 commit e5b3936

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

auto_process_ngs/commands/make_fastqs_cmd.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#
33
# make_fastqs_cmd.py: implement auto process make_fastqs command
4-
# Copyright (C) University of Manchester 2018-2025 Peter Briggs
4+
# Copyright (C) University of Manchester 2018-2026 Peter Briggs
55
#
66
#########################################################################
77

@@ -392,7 +392,12 @@ def make_fastqs(ap,protocol='standard',platform=None,
392392
if enable_conda is None:
393393
enable_conda = ap.settings.conda.enable_conda
394394
if conda_env_dir is None:
395-
conda_env_dir = ap.settings.conda.env_dir
395+
if ap.settings.conda.env_dir is not None:
396+
# Use value from configuration
397+
conda_env_dir = ap.settings.conda.env_dir
398+
else:
399+
# Use subdirectory of analysis dir
400+
conda_env_dir = os.path.join(ap.analysis_dir, "__conda", "envs")
396401

397402
# Other pipeline settings
398403
poll_interval = ap.settings.general.poll_interval

0 commit comments

Comments
 (0)