Skip to content

Commit cf38a2e

Browse files
committed
fix conda issue
1 parent c3cb0c9 commit cf38a2e

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.5.0
4+
5+
- actually remove `--force` from `mamba|conda` commands
6+
37
## 1.4.0
48

59
- added:

bactopia/cli/download.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"--use-conda",
3939
"--singularity_cache",
4040
"--singularity_pull_docker_container",
41-
"--force-rebuild",
41+
"--force_rebuild",
4242
"--max_retry",
4343
],
4444
},
@@ -364,7 +364,7 @@ def build_conda_env(
364364
success = False
365365
while not success:
366366
result = execute(
367-
f"rm -rf {conda_path} && {program} create -y -p {conda_path} -c conda-forge -c bioconda --force {conda_env}",
367+
f"rm -rf {conda_path} && {program} create -y -p {conda_path} -c conda-forge -c bioconda {conda_env}",
368368
allow_fail=allow_fail,
369369
)
370370
if not result:
@@ -483,7 +483,7 @@ def build_singularity_image(image, pull, max_retry=5, force=False, use_build=Fal
483483
help="Force conversion of Docker containers, instead downloading Singularity images directly",
484484
)
485485
@click.option(
486-
"--force-rebuild",
486+
"--force_rebuild",
487487
is_flag=True,
488488
help="Force overwrite of existing pre-built environments.",
489489
)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "bactopia"
3-
version = "1.4.0"
3+
version = "1.5.0"
44
description = "A Python package for working with Bactopia"
55
authors = [
66
"Robert A. Petit III <robbie.petit@gmail.com>",

0 commit comments

Comments
 (0)