Skip to content

Commit 065648e

Browse files
authored
Merge pull request #61 from TRON-Bioinformatics/56_add_mamba_support
Add mamba support and update pangolin lineage determination
2 parents 7d750f0 + c504bd6 commit 065648e

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

.github/workflows/automated_tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
java-version: '11'
1515
- uses: conda-incubator/setup-miniconda@v2
1616
with:
17+
mamba-version: "*"
1718
auto-update-conda: true
1819
channels: conda-forge,bioconda,defaults
1920
- name: Install dependencies
@@ -30,4 +31,4 @@ jobs:
3031
- name: Run tests
3132
run: |
3233
export NXF_VER=22.04.5
33-
make
34+
make

.gitlab-ci.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,23 @@ before_script:
88
#- pip3 install biopython==1.76
99
- wget -qO- https://get.nextflow.io | bash && cp nextflow /usr/local/bin/nextflow
1010
- nextflow help
11-
- wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
11+
- wget -q https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh
1212
- mkdir /root/.conda
13-
- bash Miniconda3-latest-Linux-x86_64.sh -b && cp /root/miniconda3/bin/* /usr/local/bin/
14-
- rm -f Miniconda3-latest-Linux-x86_64.sh
15-
- conda --version
13+
- bash Mambaforge-Linux-x86_64.sh -b -p /usr/local/bin/conda
14+
- rm -f Mambaforge-Linux-x86_64.sh
15+
- source /usr/local/bin/conda/etc/profile.d/conda.sh
16+
- source /usr/local/bin/conda/etc/profile.d/mamba.sh
17+
- which mamba
18+
- mamba --version
19+
# this is a workaround for https://github.com/mamba-org/mamba/issues/1993
20+
- echo "use_lockfiles:" >> ~/.mambarc
21+
- echo " - false" >> ~/.mambarc
22+
- echo "channels:" >> ~/.mambarc
23+
- echo " - defaults" >> ~/.mambarc
24+
- echo " - conda-forge" >> ~/.mambarc
25+
- echo " - bioconda" >> ~/.mambarc
26+
- cat ~/.mambarc
27+
1628

1729
stages:
1830
- test

modules/07_lineage_annotation.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ process PANGOLIN_LINEAGE {
99
publishDir "${params.output}", mode: "copy"
1010
tag "${name}"
1111

12-
conda (params.enable_conda ? "bioconda::pangolin=4.1.2" : null)
12+
conda (params.enable_conda ? "bioconda::pangolin=4.3" : null)
1313

1414
input:
1515
tuple val(name), val(caller), file(fasta)

nextflow.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ profiles {
3232
conda {
3333
params.enable_conda = true
3434
conda.enabled = true
35+
conda.useMamba = true
3536
}
3637
debug { process.beforeScript = 'echo $HOSTNAME' }
3738
test {

0 commit comments

Comments
 (0)