diff --git a/atlas/atlas.py b/atlas/atlas.py index 8afc7342..ae674d7f 100644 --- a/atlas/atlas.py +++ b/atlas/atlas.py @@ -247,7 +247,7 @@ def run_download(db_dir, jobs, snakemake_args): cmd = ( "snakemake --snakefile {snakefile} download " "--jobs {jobs} --rerun-incomplete " - "--conda-frontend mamba --scheduler greedy " + "--scheduler greedy " "--nolock --use-conda --conda-prefix {conda_prefix} " " --show-failed-logs " "--config database_dir='{db_dir}' {add_args} " diff --git a/atlasenv.yml b/atlasenv.yml index c1ec80ea..1fc9f561 100644 --- a/atlasenv.yml +++ b/atlasenv.yml @@ -4,7 +4,7 @@ channels: - defaults dependencies: - python >=3.8, < 3.12 - - mamba + - mamba=1 # https://github.com/metagenome-atlas/atlas/issues/742 - bbmap >= 39.01, <40 - snakemake-minimal >= 7.18.1, <7.26 - pygments diff --git a/test/test_docker.sh b/test/test_docker.sh new file mode 100644 index 00000000..775881a1 --- /dev/null +++ b/test/test_docker.sh @@ -0,0 +1,9 @@ +#! /bin/bash + +pip install -e . + +atlas --help + +cd test + +./test_local.sh #--conda-frontend conda \ No newline at end of file diff --git a/workflow/envs/fasta.yaml b/workflow/envs/fasta.yaml index 13fc46c2..7beaf1f7 100644 --- a/workflow/envs/fasta.yaml +++ b/workflow/envs/fasta.yaml @@ -3,7 +3,7 @@ channels: - bioconda - defaults dependencies: - - pyfastx=0.9 + - pyfastx=2.1 - pandas=1.2 - pyarrow - biopython diff --git a/workflow/envs/required_packages.yaml b/workflow/envs/required_packages.yaml index 9ec72359..07b3f638 100644 --- a/workflow/envs/required_packages.yaml +++ b/workflow/envs/required_packages.yaml @@ -9,4 +9,4 @@ dependencies: - bzip2 >=1.0 - pandas >=1.2, <2 - samtools >=1.13, <2 - - sambamba <1 + - sambamba