Merge branch 'master' into mulled-v2-4302fa3f4a1395caf5f23cc6b40cf0b00315a37c-8693ca46f1dc19f6be603e7b46c876f9cf4bcc62

bgruening · web-flow · commit a83a4f2aecde · 2026-06-30T05:44:28.000+02:00
diff --git a/combinations/geopandas:1.1.4-0.tsv b/combinations/geopandas:1.1.4-0.tsv
@@ -0,0 +1,2 @@
+#targets	base_image	image_build
+geopandas=1.1.4	quay.io/bioconda/base-glibc-busybox-bash:latest	0
diff --git a/combinations/mulled-v2-82ec636d394ebdd53cc58ea66f0110cd4e9ed507:fd2f6f38ed2ef914708503f7f9d881f4ed59e2da-0.tsv b/combinations/mulled-v2-82ec636d394ebdd53cc58ea66f0110cd4e9ed507:fd2f6f38ed2ef914708503f7f9d881f4ed59e2da-0.tsv
@@ -0,0 +1,2 @@
+#targets	base_image	image_build
+python=3.10,bokeh=3.7.3,pandas=2.2.3,numpy=2.2.0	quay.io/bioconda/base-glibc-busybox-bash:latest	0
diff --git a/combinations/mulled-v2-e9ce8ab9d0b45fc5352644d19f5fb7acc03a8a67:9c09068d6da12f0de4dd441c75bd21654433ce96-0.tsv b/combinations/mulled-v2-e9ce8ab9d0b45fc5352644d19f5fb7acc03a8a67:9c09068d6da12f0de4dd441c75bd21654433ce96-0.tsv
@@ -0,0 +1,2 @@
+#targets	base_image	image_build
+python=3.10,pandas=2.2.3	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`	`+geopandas=1.1.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`	`+python=3.10,bokeh=3.7.3,pandas=2.2.3,numpy=2.2.0 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`	`+python=3.10,pandas=2.2.3 quay.io/bioconda/base-glibc-busybox-bash:latest 0`