calkit-python 0.24.5__tar.gz → 0.24.7__tar.gz

{calkit_python-0.24.5 → calkit_python-0.24.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calkit-python
-Version: 0.24.5
+Version: 0.24.7
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.24.5 → calkit_python-0.24.7}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.24.5"
+__version__ = "0.24.7"
 
 from .core import *  # noqa: F403, I001
 from . import git  # noqa: F401

{calkit_python-0.24.5 → calkit_python-0.24.7}/calkit/cli/check.py

@@ -181,17 +181,26 @@ def check_docker_env(
             "Lock file output path must be provided if input Dockerfile is not"
         )
 
-    def get_docker_inspect():
+    def get_docker_inspect() -> dict:
+        # This command returns a list, of which we want the first object
         out = json.loads(
             subprocess.check_output(["docker", "inspect", tag]).decode()
         )
         # Remove some keys that can change without the important aspects of
         # the image changing
-        _ = out[0].pop("Id")
-        _ = out[0].pop("RepoDigests")
-        _ = out[0].pop("Metadata")
-        _ = out[0].pop("DockerVersion")
-        return out
+        # Only keep certain keys that are relevant for identifying the
+        # content in the image
+        keys = [
+            "RepoTags",
+            "Architecture",
+            "Os",
+            "Size",
+            "RootFS",
+        ]
+        resp = {}
+        for key in keys:
+            resp[key] = out[0].get(key)
+        return resp
 
     def get_md5(path: str, exclude_files: list[str] | None = None) -> str:
         if os.path.isdir(path):
@@ -208,7 +217,7 @@ def check_docker_env(
         inspect = get_docker_inspect()
     except subprocess.CalledProcessError:
         typer.echo(f"No image with tag {tag} found locally", file=outfile)
-        inspect = []
+        inspect = {}
     if fpath is not None:
         typer.echo(f"Reading Dockerfile from {fpath}", file=outfile)
         dockerfile_md5 = get_md5(fpath)
@@ -227,6 +236,9 @@ def check_docker_env(
         typer.echo(f"Reading lock file: {lock_fpath}", file=outfile)
         with open(lock_fpath) as f:
             lock = json.load(f)
+        # Handle legacy lock files that are lists
+        if isinstance(lock, list):
+            lock = lock[0]
     else:
         typer.echo(f"Lock file ({lock_fpath}) does not exist", file=outfile)
         lock = None
@@ -234,12 +246,12 @@ def check_docker_env(
         typer.echo(
             "Checking image and Dockerfile against lock file", file=outfile
         )
-        rebuild_or_pull = inspect[0]["RootFS"]["Layers"] != lock[0]["RootFS"][
+        rebuild_or_pull = inspect["RootFS"]["Layers"] != lock["RootFS"][
             "Layers"
-        ] or dockerfile_md5 != lock[0].get("DockerfileMD5")
+        ] or dockerfile_md5 != lock.get("DockerfileMD5")
         if not rebuild_or_pull:
             for dep, md5 in deps_md5s.items():
-                if md5 != lock[0].get("DepsMD5s", {}).get(dep):
+                if md5 != lock.get("DepsMD5s", {}).get(dep):
                     typer.echo(f"Found modified dependency: {dep}")
                     rebuild_or_pull = True
                     break
@@ -261,8 +273,8 @@ def check_docker_env(
             raise_error(f"Failed to pull image: {tag}")
     # Write the lock file
     inspect = get_docker_inspect()
-    inspect[0]["DockerfileMD5"] = dockerfile_md5
-    inspect[0]["DepsMD5s"] = deps_md5s
+    inspect["DockerfileMD5"] = dockerfile_md5
+    inspect["DepsMD5s"] = deps_md5s
     lock_dir = os.path.dirname(lock_fpath)
     if lock_dir:
         os.makedirs(lock_dir, exist_ok=True)