calkit-python 0.11.2__tar.gz → 0.11.3__tar.gz

{calkit_python-0.11.2 → calkit_python-0.11.3}/PKG-INFO

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

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.11.2"
+__version__ = "0.11.3"
 
 from .core import *
 from . import git

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/cli/main.py

@@ -7,6 +7,7 @@ import functools
 import hashlib
 import json
 import os
+import platform as _platform
 import subprocess
 import sys
 import time
@@ -657,7 +658,6 @@ def run_in_env(
         except subprocess.CalledProcessError:
             raise_error(f"Failed to run in {env['kind']} environment")
     elif env["kind"] == "uv-venv":
-        # TODO: This doesn't work on Windows
         if "prefix" not in env:
             raise_error("uv-venv environments require a prefix")
         if "path" not in env:
@@ -676,8 +676,12 @@ def run_in_env(
                     raise_error(f"Failed to create uv-venv at {prefix}")
             fname, ext = os.path.splitext(path)
             lock_fpath = fname + "-lock" + ext
+            if _platform.system() == "Windows":
+                activate_cmd = f"{prefix}\\Scripts\\activate"
+            else:
+                activate_cmd = f". {prefix}/bin/activate"
             check_cmd = (
-                f". {prefix}/bin/activate "
+                f"{activate_cmd} "
                 f"&& uv pip install -q -r {path} "
                 f"&& uv pip freeze > {lock_fpath} "
                 "&& deactivate"
@@ -689,7 +693,7 @@ def run_in_env(
             except subprocess.CalledProcessError:
                 raise_error("Failed to check uv-venv")
         # Now run the command
-        cmd = f". {prefix}/bin/activate && {shell_cmd} && deactivate"
+        cmd = f"{activate_cmd} && {shell_cmd} && deactivate"
         if verbose:
             typer.echo(f"Running command: {cmd}")
         try:

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/cli/new.py

@@ -1035,3 +1035,67 @@ def new_conda_env(
         repo.git.add("dvc.yaml")
     if not no_commit and repo.git.diff("--staged"):
         repo.git.commit(["-m", f"Add Conda environment {name}"])
+
+
+@new_app.command("uv-venv")
+def new_uv_venv(
+    packages: Annotated[
+        list[str],
+        typer.Argument(help="Packages to include in the environment."),
+    ],
+    name: Annotated[
+        str, typer.Option("--name", "-n", help="Environment name.")
+    ],
+    path: Annotated[
+        str, typer.Option("--path", help="Path for requirements file.")
+    ] = "requirements.txt",
+    prefix: Annotated[
+        str, typer.Option("--prefix", help="Prefix for environment location.")
+    ] = ".venv",
+    description: Annotated[
+        str, typer.Option("--description", help="Description.")
+    ] = None,
+    overwrite: Annotated[
+        bool,
+        typer.Option(
+            "--overwrite",
+            "-f",
+            help="Overwrite any existing environment with this name.",
+        ),
+    ] = False,
+    no_commit: Annotated[
+        bool, typer.Option("--no-commit", help="Do not commit changes.")
+    ] = False,
+):
+    """Create a new uv virtual environment."""
+    if os.path.isfile(path) and not overwrite:
+        raise_error("Output path already exists (use -f to overwrite)")
+    repo = git.Repo()
+    # Add environment to Calkit info
+    ck_info = calkit.load_calkit_info()
+    # If environments is a list instead of a dict, reformulate it
+    envs = ck_info.get("environments", {})
+    if isinstance(envs, list):
+        typer.echo("Converting environments from list to dict")
+        envs = {env.pop("name"): env for env in envs}
+    if name in envs and not overwrite:
+        raise_error(
+            f"Environment with name {name} already exists "
+            "(use -f to overwrite)"
+        )
+    packages_txt = "\n".join(packages)
+    # Write environment to path
+    with open(path, "w") as f:
+        f.write(packages_txt)
+    repo.git.add(path)
+    typer.echo("Adding environment to calkit.yaml")
+    env = dict(path=path, kind="uv-venv", prefix=prefix)
+    if description is not None:
+        env["description"] = description
+    envs[name] = env
+    ck_info["environments"] = envs
+    with open("calkit.yaml", "w") as f:
+        ryaml.dump(ck_info, f)
+    repo.git.add("calkit.yaml")
+    if not no_commit and repo.git.diff("--staged"):
+        repo.git.commit(["-m", f"Add uv venv {name}"])

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/core.py

@@ -64,7 +64,7 @@ def load_calkit_info(
     wdir=None,
     process_includes: bool | str | list[str] = False,
     as_pydantic: bool = False,
-) -> dict:
+) -> dict | ProjectInfo:
     """Load Calkit project information.
 
     Parameters

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/models.py

@@ -63,7 +63,15 @@ class ReferenceCollection(BaseModel):
 
 class Environment(BaseModel):
     kind: Literal[
-        "conda", "docker", "pip", "poetry", "npm", "yarn", "remote-ssh"
+        "conda",
+        "docker",
+        "poetry",
+        "npm",
+        "yarn",
+        "remote-ssh",
+        "uv",
+        "pixi",
+        "uv-venv",
     ]
     path: str | None = None
     description: str | None = None
@@ -71,8 +79,13 @@ class Environment(BaseModel):
     default: bool | None = None
 
 
+class UvVenvEnvironment(Environment):
+    kind: Literal["uv-venv"]
+    prefix: str
+
+
 class DockerEnvironment(Environment):
-    kind: str = "docker"
+    kind: Literal["docker"]
     image: str
     layers: list[str] | None = None
     shell: Literal["bash", "sh"] = "sh"
@@ -202,7 +215,9 @@ class ProjectInfo(BaseModel):
     figures: list[Figure] = []
     publications: list[Publication] = []
     references: list[ReferenceCollection] = []
-    environments: dict[str, Environment | DockerEnvironment] = {}
+    environments: dict[
+        str, Environment | DockerEnvironment | UvVenvEnvironment
+    ] = {}
     software: list[Software] = []
     notebooks: list[Notebook] = []
     procedures: dict[str, Procedure] = {}

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/tests/cli/test_main.py

@@ -89,6 +89,23 @@ def test_run_in_env(tmp_dir):
     ck_info = calkit.load_calkit_info()
     env = ck_info["environments"]["py3.10"]
     assert env.get("path") is None
+    # Test uv venv
+    subprocess.check_call(
+        ["calkit", "new", "uv-venv", "-n", "uv1", "polars==1.18.0"]
+    )
+    out = subprocess.check_output(
+        [
+            "calkit",
+            "runenv",
+            "-n",
+            "uv1",
+            "--",
+            "python",
+            "-c",
+            "'import polars; print(polars.__version__)'",
+        ]
+    ).decode().strip()
+    assert out == "1.18.0"
 
 
 def test_check_call():

{calkit_python-0.11.2 → calkit_python-0.11.3}/calkit/tests/cli/test_new.py

@@ -169,3 +169,46 @@ def test_new_publication(tmp_dir):
         "calkit runenv -n my-latex-env "
         '"cd my-paper && latexmk -interaction=nonstopmode -pdf paper.tex"'
     )
+
+
+def test_new_uv_venv(tmp_dir):
+    subprocess.check_call(["git", "init"])
+    subprocess.check_call(["dvc", "init"])
+    subprocess.check_call(
+        [
+            "calkit",
+            "new",
+            "uv-venv",
+            "-n",
+            "my-uv-venv",
+            "pandas>=2.0",
+            "matplotlib",
+        ]
+    )
+    ck_info = calkit.load_calkit_info(as_pydantic=True)
+    envs = ck_info.environments
+    env = envs["my-uv-venv"]
+    assert env.path == "requirements.txt"
+    assert env.prefix == ".venv"
+    assert env.kind == "uv-venv"
+    subprocess.check_call(
+        [
+            "calkit",
+            "new",
+            "uv-venv",
+            "-n",
+            "my-uv-venv2",
+            "--path",
+            "requirements-2.txt",
+            "--prefix",
+            ".venv2",
+            "pandas>=2.0",
+            "matplotlib",
+        ]
+    )
+    ck_info = calkit.load_calkit_info(as_pydantic=True)
+    envs = ck_info.environments
+    env = envs["my-uv-venv2"]
+    assert env.path == "requirements-2.txt"
+    assert env.prefix == ".venv2"
+    assert env.kind == "uv-venv"