Merge pull request #106 from MartinPippel/update_blast

Update blast
NBISweden · Jan 15, 2024 · 3af6af1 · 3af6af1
2 parents ca4fbbb + 48c4d9a
commit 3af6af1
Show file tree

Hide file tree

Showing 10 changed files with 293 additions and 88 deletions.
diff --git a/modules.json b/modules.json
@@ -1,58 +1,45 @@
 {
-    "name": "NBIS Genome Annotation Workflow",
-    "homePage": "",
-    "repos": {
-        "https://github.com/nf-core/modules.git": {
-            "modules": {
-                "nf-core": {
-                    "blast/makeblastdb": {
-                        "branch": "master",
-                        "git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
-                        "installed_by": [
-                            "modules"
-                        ],
-                        "patch": "modules/nf-core/blast/makeblastdb/blast-makeblastdb.diff"
-                    },
-                    "busco": {
-                        "branch": "master",
-                        "git_sha": "6d6552cb582f56b6101c452e16ee7c23073f91de",
-                        "installed_by": [
-                            "modules"
-                        ]
-                    },
-                    "fastp": {
-                        "branch": "master",
-                        "git_sha": "d497a4868ace3302016ea8ed4b395072d5e833cd",
-                        "installed_by": [
-                            "modules"
-                        ]
-                    },
-                    "fastqc": {
-                        "branch": "master",
-                        "git_sha": "9a4517e720bc812e95b56d23d15a1653b6db4f53",
-                        "installed_by": [
-                            "modules"
-                        ]
-                    },
-                    "interproscan": {
-                        "branch": "master",
-                        "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
-                        "installed_by": [
-                            "modules"
-                        ]
-                    },
-                    "multiqc": {
-                        "branch": "master",
-                        "git_sha": "a6e11ac655e744f7ebc724be669dd568ffdc0e80",
-                        "installed_by": [
-                            "modules"
-                        ]
-                    }
-                }
-            },
-            "subworkflows": {
-                "nf-core": {}
-            }
+  "name": "NBIS Genome Annotation Workflow",
+  "homePage": "",
+  "repos": {
+    "https://github.com/nf-core/modules.git": {
+      "modules": {
+        "nf-core": {
+          "blast/makeblastdb": {
+            "branch": "master",
+            "git_sha": "a01c66c96e0bc610ad126e7adc4a94cd4acd1b48",
+            "installed_by": ["modules"]
+          },
+          "busco": {
+            "branch": "master",
+            "git_sha": "6d6552cb582f56b6101c452e16ee7c23073f91de",
+            "installed_by": ["modules"]
+          },
+          "fastp": {
+            "branch": "master",
+            "git_sha": "d497a4868ace3302016ea8ed4b395072d5e833cd",
+            "installed_by": ["modules"]
+          },
+          "fastqc": {
+            "branch": "master",
+            "git_sha": "9a4517e720bc812e95b56d23d15a1653b6db4f53",
+            "installed_by": ["modules"]
+          },
+          "interproscan": {
+            "branch": "master",
+            "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
+            "installed_by": ["modules"]
+          },
+          "multiqc": {
+            "branch": "master",
+            "git_sha": "a6e11ac655e744f7ebc724be669dd568ffdc0e80",
+            "installed_by": ["modules"]
+          }
         }
+      },
+      "subworkflows": {
+        "nf-core": {}
+      }
     }
+  }
 }
diff --git a/modules/local/blast/blastp.nf b/modules/local/blast/blastp.nf
@@ -2,10 +2,10 @@ process BLAST_BLASTP {
     tag "${fasta.baseName}"
     label 'process_medium'
 
-    conda 'bioconda::blast=2.12.0'
+    conda 'bioconda::blast=2.15.0'
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/blast:2.12.0--pl5262h3289130_0' :
-        'biocontainers/blast:2.12.0--pl5262h3289130_0' }"
+        'https://depot.galaxyproject.org/singularity/blast:2.15.0--pl5321h6f7f691_1' :
+        'biocontainers/blast:2.15.0--pl5321h6f7f691_1' }"
 
     input:
     tuple val(meta), path(fasta)

diff --git a/modules/nf-core/blast/makeblastdb/blast-makeblastdb.diff b/modules/nf-core/blast/makeblastdb/blast-makeblastdb.diff
diff --git a/modules/nf-core/blast/makeblastdb/environment.yml b/modules/nf-core/blast/makeblastdb/environment.yml
diff --git a/modules/nf-core/blast/makeblastdb/main.nf b/modules/nf-core/blast/makeblastdb/main.nf
diff --git a/modules/nf-core/blast/makeblastdb/meta.yml b/modules/nf-core/blast/makeblastdb/meta.yml
diff --git a/modules/nf-core/blast/makeblastdb/tests/main.nf.test b/modules/nf-core/blast/makeblastdb/tests/main.nf.test