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 irma recipe to version 1.1.4 #51522

Merged
merged 4 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
12 changes: 6 additions & 6 deletions recipes/irma/irma-check-dir-writable.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- IRMA 2022-05-09 15:15:26.345377197 -0500
+++ IRMA 2022-05-09 15:19:18.818708355 -0500
@@ -111,7 +111,7 @@
--- IRMA 2024-02-21 18:55:07.000000000 +0100
+++ IRMA 2024-10-21 10:37:13.744040564 +0200
@@ -141,7 +141,7 @@

# make sure output directory is valid
if [ ! -w "$destination_directory" ];then
- abort "output directory not writable: $destination_directory"
+ timestamp "WARNING: output directory may not be writable: $destination_directory"
if [ ! -w "$destination_directory" ]; then
- abort "output directory not writable: $destination_directory"
+ timestamp "WARNING: output directory may not writable: $destination_directory"
wm75 marked this conversation as resolved.
Show resolved Hide resolved
fi

# test input files
33 changes: 16 additions & 17 deletions recipes/irma/irma-fix-bin-cmds.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- IRMA 2021-03-11 13:45:41.000000000 -0600
+++ IRMA 2021-06-04 16:18:36.088939674 -0500
@@ -140,14 +140,14 @@
--- IRMA 2024-02-21 18:55:07.000000000 +0100
+++ IRMA 2024-10-21 10:52:21.634249943 +0200
@@ -172,14 +172,14 @@
check_prgm Rscript
check_prgm perl

Expand All @@ -18,30 +18,29 @@
-BASH=bash
+RSCRIPT="Rscript"
+BASH="bash"
MERGESAMPAIRS=("$spath/mergeSAMpairs.pl")
FASTQ_CONVERTER=("$spath/fastQ_converter.pl")

# select cat for reading reads
if [ "${#LEFT}" -gt "2" ];then
@@ -204,14 +204,19 @@
exit 0
fi
@@ -267,14 +267,18 @@
fi
fi
+
+if [ -r "./irma_config.sh" ]; then
+ echo "Loading config file 'irma_config.sh'"
+ source "./irma_config.sh"
+else
+ echo "No user config file 'irma_config.sh' specified."
+fi
+
[ ! -z "$LFASTM" ] && SECONDARY_SORT=$LFASTM
[ -n "$LFASTM" ] && SECONDARY_SORT=$LFASTM
REF1_SET=$REF_SET

# selection of zip utility
-if command -v "$spath"/pigz_$OS >/dev/null 2>&1;then
- ZIP="$spath"/pigz_$OS
- Z_OPTS="-p $DOUBLE_LOCAL_PROC -4"
-elif command -v pigz >/dev/null 2>&1;then
-if command -v "$spath"/pigz_$OS > /dev/null 2>&1; then
- ZIP="$spath"/pigz_$OS
- Z_OPTS="-p $DOUBLE_LOCAL_PROC -4"
-elif command -v pigz > /dev/null 2>&1; then
+if command -v "pigz" >/dev/null 2>&1;then
ZIP="pigz"
Z_OPTS="-p $DOUBLE_LOCAL_PROC -4"
elif command -v gzip >/dev/null 2>&1;then
ZIP="pigz"
Z_OPTS="-p $DOUBLE_LOCAL_PROC -4"
elif command -v gzip > /dev/null 2>&1; then
10 changes: 5 additions & 5 deletions recipes/irma/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{% set name = "IRMA" %}
{% set version = "1.0.3" %}
{% set hash_type = "sha256" %}
{% set hash_value = "c5f6b452e1a6cfa8dcb02d1646c9e30e071557327a7cf11cab91a9b92e0eb455" %}
{% set version = "1.1.4" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://wonder.cdc.gov/amd/flu/irma/flu-amd-202209.zip
{{ hash_type }}: {{ hash_value }}
url: https://wonder.cdc.gov/amd/flu/irma/flu-amd-202402.zip
sha256: 483183c5d18a718df5efe2bf4411f80e026fd169247e5b5cb614cb2e9998425b
patches:
- irma-fix-bin-cmds.patch
- label-fix-bin-cmds.patch
Expand All @@ -18,6 +16,8 @@ source:
build:
number: 0
noarch: generic
run_exports:
- {{ pin_subpackage('irma', max_pin="x.x") }}

requirements:
host:
Expand Down