Merge branch 'master' into add_datasets_samtools_unzip

bgruening · web-flow · commit c64f380993b7 · 2025-04-29T18:35:39.000+02:00
diff --git a/combinations/hash.tsv b/combinations/hash.tsv
@@ -644,3 +644,4 @@ amulety=1.1,igblast=1.22.0
 bioconductor-sparsesignatures=2.16.0,bioconductor-bsgenome.hsapiens.1000genomes.hs37d5=0.99.1,bioconductor-bsgenome.hsapiens.ucsc.hg38=1.4.5,r-dplyr=1.1.4,r-tidyr=1.3.1,r-patchwork=1.3.0
 khmer=3.0.0a3,sourmash=4.8.3
 ncbi-datasets-cli=15.11.0,samtools=1.18,unzip=6.0
+quarto=1.6.41,r-pathosurveilr=0.3.1
diff --git a/combinations/mulled-v2-bddec11518ad9f663452ca2d476c114735687122:1bc9545319dfeab88abf4a5886e3175f77723897-0.tsv b/combinations/mulled-v2-bddec11518ad9f663452ca2d476c114735687122:1bc9545319dfeab88abf4a5886e3175f77723897-0.tsv
@@ -0,0 +1,2 @@
+#targets	base_image	image_build
+nbconvert=7.16.6,oda-api=1.2.33,astroquery=0.4.10,astropy=6.1.4,matplotlib=3.10.1,ipython=9.1.0,wget=1.21.4	quay.io/bioconda/base-glibc-busybox-bash:latest	0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#targets base_image image_build`
	`2`	`+nbconvert=7.16.6,oda-api=1.2.33,astroquery=0.4.10,astropy=6.1.4,matplotlib=3.10.1,ipython=9.1.0,wget=1.21.4 quay.io/bioconda/base-glibc-busybox-bash:latest 0`