calkit-python 0.2.0__tar.gz → 0.2.1__tar.gz

{calkit_python-0.2.0 → calkit_python-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: calkit-python
-Version: 0.2.0
+Version: 0.2.1
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://github.com/calkit/calkit
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.2.0 → calkit_python-0.2.1}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 from .core import *
 from . import git

{calkit_python-0.2.0 → calkit_python-0.2.1}/calkit/cli/main.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import hashlib
 import json
 import os
 import subprocess
@@ -583,6 +584,10 @@ def build_docker(
     except subprocess.CalledProcessError:
         typer.echo(f"No image with tag {tag} found locally")
         inspect = []
+    typer.echo(f"Reading Dockerfile from {fpath}")
+    with open(fpath) as f:
+        dockerfile = f.read()
+    dockerfile_md5 = hashlib.md5(dockerfile.encode()).hexdigest()
     lock_fpath = fpath + "-lock.json"
     rebuild = True
     if os.path.isfile(lock_fpath):
@@ -593,11 +598,14 @@ def build_docker(
         typer.echo(f"Lock file ({lock_fpath}) does not exist")
         lock = None
     if inspect and lock:
-        typer.echo("Checking image against lock file")
-        rebuild = inspect[0]["RootFS"]["Layers"] != lock[0]["RootFS"]["Layers"]
+        typer.echo("Checking image and Dockerfile against lock file")
+        rebuild = inspect[0]["RootFS"]["Layers"] != lock[0]["RootFS"][
+            "Layers"
+        ] or dockerfile_md5 != lock[0].get("DockerfileMD5")
     if rebuild:
         subprocess.check_call(["docker", "build", "-t", tag, "-f", fpath, "."])
     # Write the lock file
     inspect = get_docker_inspect()
+    inspect[0]["DockerfileMD5"] = dockerfile_md5
     with open(lock_fpath, "w") as f:
         json.dump(inspect, f, indent=4)

{calkit_python-0.2.0 → calkit_python-0.2.1}/calkit/cli/new.py

@@ -297,7 +297,8 @@ def new_docker_env(
             ]
         )
     repo.git.add("calkit.yaml")
-    repo.git.add("dvc.yaml")
+    if stage:
+        repo.git.add("dvc.yaml")
     if not no_commit and repo.git.diff("--staged"):
         repo.git.commit(["-m", f"Add Docker environment {name}"])
 

{calkit_python-0.2.0 → calkit_python-0.2.1}/calkit/docker.py

@@ -1,6 +1,6 @@
 """Functionality for working with Docker."""
 
-MAMBAFORGE_LAYER_TXT = """
+MAMBAFORGE_LAYER_TXT = r"""
 # Install Miniforge
 ARG MINIFORGE_NAME=Mambaforge
 ARG MINIFORGE_VERSION=24.3.0-0
@@ -40,8 +40,10 @@ RUN apt-get update > /dev/null && \
     echo ". ${CONDA_DIR}/etc/profile.d/conda.sh && conda activate base" >> ~/.bashrc
 """.strip()
 
-FOAMPY_LAYER_TEXT = """
-RUN pip install numpy pandas matplotlib && pip install scipy && pip install foampy
+FOAMPY_LAYER_TEXT = r"""
+RUN pip install --no-cache-dir numpy pandas matplotlib h5py \
+    && pip install --no-cache-dir scipy \
+    && pip install --no-cache-dir foampy
 """.strip()
 
 LAYERS = {