Merge branch 'qc' of github.com:caracal-pipeline/cult-cargo into qc

Author: landmanbester

MANIFEST.in

@@ -1,6 +1,7 @@
 include LICENSE
 include README.md
 include CHANGES.md
+include cultcargo/stimela.conf
 
 recursive-include cabs/ *.yml *.yaml
 recursive-include cabs/recipe/ *.yaml *.yml

cultcargo/builder/build_cargo.py

@@ -321,7 +321,6 @@ def resolve_config_reference(value):
                     run(f"docker push {full_image}", cwd=path)
                     if image_version == tag_latest.get(image):
                         run(f"docker push {registry}/{image}:{BUNDLE_VERSION}")
-
             progress.update(progress_task, description=
                 f"image [bold]{image}[/bold] [{i_image}/{len(imagenames)}]: tagging latest version")
 

cultcargo/genesis/quartical/config_classes.py

@@ -39,7 +39,7 @@ def __validate_element_choices__(self):
                     elements = value.values()
                 else:
                     raise ValueError(
-                        f"Paramter {name} of type {type(value)} has element "
+                        f"Parameter {name} of type {type(value)} has element "
                         f"choices. This is not supported."
                     )
                 invalid_elements = set(elements) - set(element_choices)

cultcargo/images/python-astro/Dockerfile

@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install apt-utils && \
     apt-get install -y casacore-data casacore-tools python{VERSION}-dev \
-    python3-pip python3-matplotlib \
+    python3-pip python3-pytest python3-matplotlib \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /var/cache/apt/archives 
 

cultcargo/stimela.conf

@@ -0,0 +1,10 @@
+_include: (.)genesis/cult-cargo-base.yml
+
+images:
+    default-python: 
+        _use: vars.cult-cargo.images
+        name: python-astro
+    default-casa: 
+        _use: vars.cult-cargo.images
+        name: casa
+