fixed pip upgrade

Author: o-smirnov

cultcargo/builder/build_cargo.py

@@ -82,7 +82,7 @@ def build_cargo(manifest: str, do_list=False, build=False, push=False, all=False
             "{task.description}",
             console=console, disable=boring) as progress:
         print = progress.console.print
-    
+
         progress_task = progress.add_task("loading manifest")
 
         print(Rule(f"Loading manifest {manifest}"))
@@ -317,7 +317,7 @@ def resolve_config_reference(value):
                             else:
                                 print(f"  Image exists, but package is a release candidate: ok to push.")
                         else:
-                            print(f"  Image exists, but package unreleased, ok push.")
+                            print(f"  Image exists, but package unreleased, ok to push.")
                     run(f"docker push {full_image}", cwd=path)
                     if image_version == tag_latest.get(image):
                         run(f"docker push {registry}/{image}:{BUNDLE_VERSION}")

cultcargo/builder/cargo-manifest.yml

@@ -5,7 +5,7 @@ metadata:
   GITHUB_REPOSITORY: caracal-pipeline/cult-cargo
   # registry to use. Use module::filename.yml::variable format to pull from a config file inside a python module
   REGISTRY: cultcargo.genesis::cult-cargo-base.yml::vars.cult-cargo.images.registry
-  # image bundle ersion. Use module::filename.yml::variable format to pull from a config file inside a python module
+  # image bundle version. Use module::filename.yml::variable format to pull from a config file inside a python module
   BUNDLE_VERSION: cultcargo.genesis::cult-cargo-base.yml::vars.cult-cargo.images.version
   # prefix to be removed from image version when comparing to python package version
   BUNDLE_VERSION_PREFIX: cc

cultcargo/images/python-astro/Dockerfile

@@ -10,7 +10,9 @@ RUN apt-get update && apt-get install apt-utils && \
 
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python{VERSION} 1
 
-# upgrade pip
+# needed to upgrade pip properly -- sometimes it gets stuck and is unable to upgrade itself
+RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python{VERSION}
+
 RUN python{VERSION} -mpip install --no-cache-dir -U pip setuptools wheel 
 
 # add useful astro stuff
@@ -19,7 +21,7 @@ RUN python{VERSION} -mpip install --no-cache-dir \
     owlcat dask-ms scipy omegaconf bdsf msutils
 
 # add stimela -- useful for scabha.schema_utils
-RUN python{VERSION} -mpip install --no-cache-dir git+https://github.com/caracal-pipeline/stimela@2.0rc12
+RUN python{VERSION} -mpip install --no-cache-dir "stimela>=2.0rc17"
 
 CMD /usr/bin/python{VERSION}
 

pyproject.toml

@@ -10,6 +10,7 @@ packages = [{include = "cultcargo"}]
 [tool.poetry.dependencies]
 python = "^3.8"
 stimela = "^2.0rc17"
+requests = "^2.0"
 
 [tool.poetry.scripts]
 build-cargo = "cultcargo.builder.build_cargo:driver"