put kMS and DDF in one image

Author: o-smirnov

cultcargo/builder/cargo-manifest.yml

@@ -169,26 +169,13 @@ images:
       useapp-meerklass:
         experimental_dependencies:
           - /home/oms/projects/cult-cargo/cultcargo/images/ddfacet/DDFacet-useapp-meerklass
-        pre_install: ADD DDFacet-useapp-meerklass DDFacet-branch
-        package: -e ./DDFacet-branch
+          - /home/oms/projects/cult-cargo/cultcargo/images/ddfacet/killMS-useapp-meerklass
+        pre_install: |
+          ADD DDFacet-useapp-meerklass DDFacet-branch
+          ADD killMS-useapp-meerklass killMS-branch
+        package: -e ./DDFacet-branch ./killMS-branch
       '0.8':
-        package: DDFacet==0.8.0.0
-
-  killms:
-    assign:
-      # base image for generic Python-based packages
-      base_python_image: python-astro:3.10
-      # corresponding python binary
-      python: python3.10
-    versions:
-      # experimental branch, Oleg only
-      useapp-meerklass:
-        experimental_dependencies:
-          - /home/oms/projects/cult-cargo/cultcargo/images/killms/killMS-useapp-meerklass
-        pre_install: ADD killMS-useapp-meerklass killMS-branch
-        package: -e ./killMS-branch
-      '3.2':
-        package: killMS==3.2.0
+        package: DDFacet==0.8.0.0 killMS==3.2.0
 
   mosaic-queen:
     assign: