Skip to content

Commit 191c15c

Browse files
authored
Merge branch 'master' into qc
2 parents 5877ce0 + 1efc767 commit 191c15c

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include LICENSE
22
include README.md
33
include CHANGES.md
4+
include cultcargo/stimela.conf
45

56
recursive-include cabs/ *.yml *.yaml
67
recursive-include cabs/recipe/ *.yaml *.yml

cultcargo/builder/build_cargo.py

-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ def resolve_config_reference(value):
321321
run(f"docker push {full_image}", cwd=path)
322322
if image_version == tag_latest.get(image):
323323
run(f"docker push {registry}/{image}:{BUNDLE_VERSION}")
324-
325324
progress.update(progress_task, description=
326325
f"image [bold]{image}[/bold] [{i_image}/{len(imagenames)}]: tagging latest version")
327326

cultcargo/images/python-astro/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update && apt-get install apt-utils && \
66
apt-get install -y casacore-data casacore-tools python{VERSION}-dev \
7-
python3-pip python3-matplotlib \
7+
python3-pip python3-pytest python3-matplotlib \
88
&& rm -rf /var/lib/apt/lists/* \
99
&& rm -rf /var/cache/apt/archives
1010

cultcargo/stimela.conf

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
_include: (.)genesis/cult-cargo-base.yml
2+
3+
images:
4+
default-python:
5+
_use: vars.cult-cargo.images
6+
name: python-astro
7+
default-casa:
8+
_use: vars.cult-cargo.images
9+
name: casa
10+

0 commit comments

Comments
 (0)