Merge pull request #50 from rmcolq/main

bump version of kraken2-server
artic-network · Jan 23, 2024 · 0521d10 · 0521d10
2 parents c8c7523 + e8c728f
commit 0521d10
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/dockerfiles/kraken2-server/environment.yml b/dockerfiles/kraken2-server/environment.yml
@@ -3,6 +3,6 @@ channels:
   - bioconda
   - conda-forge
   - defaults
-  - epi2melabs
+  - nanoporetech
 dependencies:
-  - kraken2-server # not on mac
+  - kraken2-server>=0.1.8 # not on mac
diff --git a/dockerfiles/scylla/environment.yml b/dockerfiles/scylla/environment.yml
@@ -9,7 +9,7 @@ dependencies:
   - pysam
   - pip
   - kraken2
-  - kraken2-server # not on mac
+  - kraken2-server>=0.1.8 # not on mac
   - fastcat
   - taxonkit
   - fastp

diff --git a/modules/kraken_client.nf b/modules/kraken_client.nf
@@ -7,7 +7,7 @@ process kraken2_client {
     label "error_retry"
     maxForks kraken_compute
 
-    conda "nanoporetech::kraken2-server=0.1.7"
+    conda "nanoporetech::kraken2-server=0.1.8"
     container "${params.wf.container}:${params.wf.container_version}"
     containerOptions {workflow.profile != "singularity" ? "--network host" : ""}
 

diff --git a/modules/kraken_server.nf b/modules/kraken_server.nf
@@ -92,7 +92,7 @@ process kraken_server {
 
 process stop_kraken_server {
     label "process_single"
-    conda "nanoporetech::kraken2-server=0.1.7"
+    conda "nanoporetech::kraken2-server=0.1.8"
     container "${params.wf.container}:${params.wf.container_version}"
     containerOptions {workflow.profile != "singularity" ? "--network host" : ""}
     // this shouldn't happen, but we'll keep retrying

diff --git a/nextflow.config b/nextflow.config
@@ -32,7 +32,7 @@ manifest {
     description     = 'Classify metagenomic sequence data from human respiratory infections.'
     mainScript      = 'main.nf'
     nextflowVersion = '>=20.10.0'
-    version         = 'v1.0.0'
+    version         = 'v1.1.2'
 }
 
 profiles {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ dependencies: @@
       - pysam
       - pip
       - kraken2
-      - kraken2-server # not on mac
+      - kraken2-server>=0.1.8 # not on mac
       - fastcat
       - taxonkit
       - fastp
@@ Expand Down @@