Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/mmaseq/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ def parse_deploy():
"used during pipeline execution. To reinstall environments "
"and/or databases, remove the `conda/` and/or the `Databases/` "
"folders in the deployment directory. (Default: %(default)s)"
)

)
)

parser.add_argument(
Expand All @@ -52,6 +51,17 @@ def parse_deploy():
)
)

parser.add_argument(
"--custom",
dest="custom",
action="store_true",
help=(
"Enable custom species configuration. (Default: %(default)s) "
"When enabled, species configuration folders (identified as species_configs/ inside the deploy_dir/) will be used. "
"If the folder doesn't allready exists, it will be copied from the install folder to the deployment directory."
)
)

parser.add_argument(
"--test",
dest="test",
Expand Down Expand Up @@ -131,7 +141,7 @@ def deploy_spe_configs(deploy_dir):
f"deploy_dir = {deploy_dir}"
")"))

spe_configs_dir = deploy_dir / "spe_configs"
spe_configs_dir = deploy_dir / "species_configs"

logger.trace("Checking whether config dir allready exists")
if not spe_configs_dir.exists():
Expand Down Expand Up @@ -318,13 +328,15 @@ def deploy(args):

deploy_dir = Path(args.deploy_dir)
update = args.update
custom = args.custom
test = args.test
retries = args.retries
threads = args.threads
verbosity = args.verbosity

logger.info("Inspecting species configuration directory")
deploy_spe_configs(deploy_dir)
if custom:
logger.info("Inspecting species configuration directory")
deploy_spe_configs(deploy_dir)

if not test:
logger.info(f"Inspecting the deployment dataset")
Expand Down
33 changes: 23 additions & 10 deletions src/mmaseq/mmaseq.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,17 @@ def parse_mmaseq():
)
)

parser.add_argument(
"--custom",
dest="custom",
action="store_true",
help=(
"Enable custom species configuration. (Default: %(default)s) "
"When enabled, species configuration folders (identified as species_configs/ inside the deploy_dir/) will be used. "
"If the folder doesn't allready exists, MMAseq will throw an error and exit."
)
)

parser.add_argument(
"--force",
dest="force",
Expand Down Expand Up @@ -447,6 +458,7 @@ def mmaseq(args):
threads = args.threads
resolve = args.resolve
clean = args.clean
custom = args.custom
force = args.force
ignore_assemblies = args.ignore_assemblies

Expand All @@ -473,16 +485,17 @@ def mmaseq(args):
samplesheet_file = resolve_samplesheet_paths(samplesheet_file, outdir)
logger.info("Resolved the file paths stated in the samplesheet")

spe_configs_dir = deploy_dir / "spe_configs"

if not spe_configs_dir.exists():
logger.warning((
f"Species configuration folder not detected in {deploy_dir}. "
f"Will use system installation configurations.\n"
f"To generate your own species configurations folder, run: \n"
f"mmadeploy --deploy_dir {deploy_dir} --threads {threads}"
))
spe_configs_dir = SPE_CONFIGS
spe_configs_dir = SPE_CONFIGS
if custom:
spe_configs_dir = deploy_dir / "species_configs"

if not spe_configs_dir.exists():
logger.error((
f"Species configuration folder not detected in {deploy_dir}. "
f"To generate your own species configurations folder, run: \n"
f"mmadeploy --deploy_dir {deploy_dir} --threads {threads}"
))
sys.exit(1)
else:
logger.info("Species configurations folder successfully detected.")

Expand Down
Loading