calkit-python 0.27.0__tar.gz → 0.27.2__tar.gz

{calkit_python-0.27.0 → calkit_python-0.27.2}/PKG-INFO

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

{calkit_python-0.27.0 → calkit_python-0.27.2}/calkit/__init__.py

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

{calkit_python-0.27.0 → calkit_python-0.27.2}/calkit/cli/main.py

@@ -620,9 +620,22 @@ def pull(
         list[str],
         typer.Option("--dvc-arg", help="Additional DVC args."),
     ] = [],
+    force: Annotated[
+        bool,
+        typer.Option(
+            "--force",
+            "-f",
+            help="Force pull, potentially overwriting local changes.",
+        ),
+    ] = False,
 ):
     """Pull with both Git and DVC."""
     typer.echo("Git pulling")
+    if force:
+        if "-f" not in git_args and "--force" not in git_args:
+            git_args.append("-f")
+        if "-f" not in dvc_args and "--force" not in dvc_args:
+            dvc_args.append("-f")
     try:
         subprocess.check_call(["git", "pull"] + git_args)
     except subprocess.CalledProcessError:

{calkit_python-0.27.0 → calkit_python-0.27.2}/calkit/cli/notebooks.py

@@ -174,12 +174,14 @@ def execute_notebook(
     )
     folder = os.path.dirname(fpath_out_exec)
     os.makedirs(folder, exist_ok=True)
+    notebook_dir = os.path.dirname(path) or None
     papermill.execute_notebook(
         input_path=path,
         output_path=fpath_out_exec,
         kernel_name=kernel_name,
         log_output=True,
         parameters=parsed_params,
+        cwd=notebook_dir,
     )
     for to_fmt in to:
         if to_fmt != "notebook":

{calkit_python-0.27.0 → calkit_python-0.27.2}/calkit/models/iteration.py

@@ -16,10 +16,19 @@ class RangeIteration(BaseModel):
 
     @property
     def values(self) -> list[int | float]:
+        # Determine precision from inputs
+        def get_decimal_places(num):
+            return len(str(num).split(".")[-1]) if "." in str(num) else 0
+
+        max_precision = max(
+            get_decimal_places(self.range.start),
+            get_decimal_places(self.range.stop),
+            get_decimal_places(self.range.step),
+        )
         vals = []
         current = self.range.start
         while current < self.range.stop:
-            vals.append(current)
+            vals.append(round(current, max_precision))
             current += self.range.step
         return vals
 

calkit_python-0.27.2/calkit/tests/cli/test_notebooks.py

@@ -0,0 +1,47 @@
+"""Tests for ``calkit.cli.notebooks``."""
+
+import os
+import shutil
+import subprocess
+
+
+def test_clean_notebook_outputs(tmp_dir):
+    # Copy in a test notebook and clean it
+    nb_fpath = os.path.join(
+        os.path.dirname(__file__), "..", "..", "..", "test", "pipeline.ipynb"
+    )
+    shutil.copy(nb_fpath, "notebook.ipynb")
+    subprocess.check_call(["calkit", "nb", "clean", "notebook.ipynb"])
+
+
+def test_execute_notebook(tmp_dir):
+    subprocess.check_call(
+        [
+            "calkit",
+            "new",
+            "project",
+            ".",
+            "-n",
+            "cool-project",
+            "--title",
+            "Cool project",
+        ]
+    )
+    subprocess.check_call(
+        ["calkit", "new", "uv-venv", "-n", "main", "ipykernel"]
+    )
+    nb_fpath = os.path.join(
+        os.path.dirname(__file__), "..", "..", "..", "test", "nb-subdir.ipynb"
+    )
+    os.makedirs("notebooks/results")
+    shutil.copy(nb_fpath, "notebooks/main.ipynb")
+    subprocess.check_call(
+        ["calkit", "nb", "execute", "notebooks/main.ipynb", "-e", "main"]
+    )
+    assert os.path.isfile("notebooks/results/something.txt")
+    os.makedirs("results")
+    shutil.copy("notebooks/main.ipynb", "main.ipynb")
+    subprocess.check_call(
+        ["calkit", "nb", "execute", "main.ipynb", "-e", "main"]
+    )
+    assert os.path.isfile("results/something.txt")

calkit_python-0.27.2/calkit/tests/models/test_iteration.py

@@ -0,0 +1,16 @@
+"""Tests for ``calkit.models.iteration``."""
+
+from calkit.models.iteration import RangeIteration, RangeIterationParams
+
+
+def test_rangeiteration():
+    r = RangeIteration(range=RangeIterationParams(start=0, stop=10, step=2))
+    assert r.values == [0, 2, 4, 6, 8]
+    r = RangeIteration(
+        range=RangeIterationParams(start=0.05, stop=0.25, step=0.1)
+    )
+    assert r.values == [0.05, 0.15]
+    r = RangeIteration(range=RangeIterationParams(start=0.5, stop=1, step=0.2))
+    assert r.values == [0.5, 0.7, 0.9]
+    r = RangeIteration(range=RangeIterationParams(start=0, stop=1, step=0.2))
+    assert r.values == [0.0, 0.2, 0.4, 0.6, 0.8]

calkit_python-0.27.2/test/nb-subdir.ipynb

@@ -0,0 +1,30 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "0",
+   "metadata": {},
+   "source": [
+    "This notebook tests that we can operate on a subfolder in our project."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "with open(\"results/something.txt\", \"w\") as f:\n",
+    "    f.write(\"It works!\")"
+   ]
+  }
+ ],
+ "metadata": {
+  "language_info": {
+   "name": "python"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

calkit_python-0.27.0/calkit/tests/cli/test_notebooks.py

@@ -1,14 +0,0 @@
-"""Tests for ``calkit.cli.notebooks``."""
-
-import os
-import shutil
-import subprocess
-
-
-def test_clean_notebook_outputs(tmp_dir):
-    # Copy in a test notebook and clean it
-    nb_fpath = os.path.join(
-        os.path.dirname(__file__), "..", "..", "..", "test", "pipeline.ipynb"
-    )
-    shutil.copy(nb_fpath, "notebook.ipynb")
-    subprocess.check_call(["calkit", "nb", "clean", "notebook.ipynb"])