Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packages #745

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion atlas/atlas.py
Original file line number Diff line number Diff line change
Expand Up @@ -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} "
Expand Down
2 changes: 1 addition & 1 deletion atlasenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions test/test_docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#! /bin/bash

pip install -e .

atlas --help

cd test

./test_local.sh #--conda-frontend conda
2 changes: 1 addition & 1 deletion workflow/envs/fasta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- bioconda
- defaults
dependencies:
- pyfastx=0.9
- pyfastx=2.1
- pandas=1.2
- pyarrow
- biopython
2 changes: 1 addition & 1 deletion workflow/envs/required_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ dependencies:
- bzip2 >=1.0
- pandas >=1.2, <2
- samtools >=1.13, <2
- sambamba <1
- sambamba
Loading