dayhoff-tools 1.7.5__tar.gz → 1.8.0__tar.gz

{dayhoff_tools-1.7.5 → dayhoff_tools-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.7.5
+Version: 1.8.0
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.7.5 → dayhoff_tools-1.8.0}/dayhoff_tools/cli/main.py

@@ -22,6 +22,7 @@ from dayhoff_tools.warehouse import (
     import_from_warehouse_typer,
 )
 
+
 def _get_dht_version() -> str:
     try:
         return version("dayhoff-tools")
@@ -35,7 +36,9 @@ def _get_dht_version() -> str:
             return "unknown"
 
 
-app = typer.Typer(help=f"Dayhoff Tools (dh) v{_get_dht_version()}\n\nUse 'dh --version' to print version and exit.")
+app = typer.Typer(
+    help=f"Dayhoff Tools (dh) v{_get_dht_version()}\n\nUse 'dh --version' to print version and exit."
+)
 
 # Utility commands
 app.command("clean")(delete_local_branch)
@@ -73,7 +76,7 @@ def _version_option(
         "-v",
         help="Print version and exit.",
         is_eager=True,
-    )
+    ),
 ):
     """Global options for the dh CLI (e.g., version)."""
     if version_flag:

{dayhoff_tools-1.7.5 → dayhoff_tools-1.8.0}/dayhoff_tools/cli/utility_commands.py

@@ -9,7 +9,6 @@ from pathlib import Path
 
 import toml
 import typer
-import yaml
 
 # Import cloud helper lazily inside functions to avoid heavy deps at module load
 
@@ -370,11 +369,15 @@ def install_dependencies(
             print("Ensuring lock file matches pyproject.mac.toml (Mac devcon)…")
             lock_cmd = ["uv", "lock"]
             print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
-            subprocess.run(lock_cmd, check=True, capture_output=True, cwd=str(mac_uv_dir))
+            subprocess.run(
+                lock_cmd, check=True, capture_output=True, cwd=str(mac_uv_dir)
+            )
 
             # Sync into the active environment
             if install_project:
-                print("Syncing dependencies into ACTIVE env and installing project [full]…")
+                print(
+                    "Syncing dependencies into ACTIVE env and installing project [full]…"
+                )
                 sync_cmd = ["uv", "sync", "--all-groups", "--active"]
                 print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
                 subprocess.run(sync_cmd, check=True, cwd=str(mac_uv_dir))
@@ -385,7 +388,13 @@ def install_dependencies(
                 print("Project installed with 'full' extras successfully.")
             else:
                 print("Syncing dependencies into ACTIVE env (project not installed)…")
-                sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project", "--active"]
+                sync_cmd = [
+                    "uv",
+                    "sync",
+                    "--all-groups",
+                    "--no-install-project",
+                    "--active",
+                ]
                 print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
                 subprocess.run(sync_cmd, check=True, cwd=str(mac_uv_dir))
                 print("Dependencies synced successfully (project not installed).")
@@ -403,7 +412,13 @@ def install_dependencies(
                 subprocess.run(sync_cmd, check=True)
             else:
                 print("Syncing dependencies into ACTIVE env (project not installed)…")
-                sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project", "--active"]
+                sync_cmd = [
+                    "uv",
+                    "sync",
+                    "--all-groups",
+                    "--no-install-project",
+                    "--active",
+                ]
                 print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
                 subprocess.run(sync_cmd, check=True)
                 print("Dependencies synced successfully (project not installed).")
@@ -436,16 +451,16 @@ def update_dependencies(
     """Update dependencies to newer versions (Mac-aware, active venv friendly).
 
     - Default Action (no flags): Updates only 'dayhoff-tools' package to latest,
-      updates the manifest's version constraint, and syncs.
+      updates ALL manifest files with the version constraint, and syncs.
     - Flags:
       --all/-a: Updates all dependencies (uv lock --upgrade) and syncs.
 
-    Mac devcontainer behavior:
-    - If STUDIO_PLATFORM=mac and `pyproject.mac.toml` exists, operate in `.mac_uv_project/`:
-      copy `pyproject.mac.toml` to `.mac_uv_project/pyproject.toml`, run uv there, and always
-      use `--active` for sync so installs target the active venv.
-    - Update the constraint inside `pyproject.mac.toml`. If not found, try `pyproject.toml`.
-    Otherwise (non-Mac), operate in repo root and also target the active venv during sync.
+    Cross-platform behavior:
+    - Always updates BOTH `pyproject.toml` and `pyproject.mac.toml` (if they exist)
+      to ensure version consistency across AWS and Mac platforms.
+    - On Mac: If STUDIO_PLATFORM=mac and `pyproject.mac.toml` exists, operates in
+      `.mac_uv_project/` and copies `pyproject.mac.toml` to `.mac_uv_project/pyproject.toml`.
+    - Always uses `--active` for sync to target the active venv.
     """
     # ANSI color codes
     BLUE = "\033[94m"
@@ -491,7 +506,7 @@ def update_dependencies(
         print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
         subprocess.run(lock_cmd, check=True, capture_output=True, cwd=uv_cwd)
 
-        # Step 2: Update pyproject.toml only if doing the dayhoff update (default)
+        # Step 2: Update both manifest files if doing the dayhoff update (default)
         if run_pyproject_update:
             print(f"Reading {lock_file_path} to find new dayhoff-tools version...")
             if not lock_file_path.exists():
@@ -518,59 +533,62 @@ def update_dependencies(
                 return
 
             print(f"Found dayhoff-tools version {locked_version} in lock file.")
-            print(f"Updating {manifest_path_for_constraint} version constraint...")
-            try:
-                content = manifest_path_for_constraint.read_text()
 
-                package_name = "dayhoff-tools"
-                package_name_esc = re.escape(package_name)
+            # Update both manifest files to ensure consistency across platforms
+            manifest_files_to_update = []
+            if pyproject_path.exists():
+                manifest_files_to_update.append(pyproject_path)
+            if mac_manifest.exists():
+                manifest_files_to_update.append(mac_manifest)
 
-                # Regex to match the dependency line, with optional extras and version spec
-                pattern = re.compile(
-                    rf"^(\s*['\"]){package_name_esc}(\[[^]]+\])?(?:[><=~^][^'\"]*)?(['\"].*)$",
-                    re.MULTILINE,
-                )
+            if not manifest_files_to_update:
+                print("Warning: No manifest files found to update.")
+                return
 
-                new_constraint_text = f">={locked_version}"
+            package_name = "dayhoff-tools"
+            package_name_esc = re.escape(package_name)
 
-                def _repl(match: re.Match):
-                    prefix = match.group(1)
-                    extras = match.group(2) or ""
-                    suffix = match.group(3)
-                    return (
-                        f"{prefix}{package_name}{extras}{new_constraint_text}{suffix}"
-                    )
+            # Regex to match the dependency line, with optional extras and version spec
+            pattern = re.compile(
+                rf"^(\s*['\"]){package_name_esc}(\[[^]]+\])?(?:[><=~^][^'\"]*)?(['\"].*)$",
+                re.MULTILINE,
+            )
 
-                new_content, num_replacements = pattern.subn(_repl, content)
-                if num_replacements > 0:
-                    manifest_path_for_constraint.write_text(new_content)
-                    print(
-                        f"Updated dayhoff-tools constraint in {manifest_path_for_constraint} to '{new_constraint_text}'"
-                    )
-                else:
-                    # Fallback: try the root pyproject if we were targeting mac manifest
-                    if manifest_path_for_constraint != pyproject_path and pyproject_path.exists():
-                        content2 = pyproject_path.read_text()
-                        new_content2, n2 = pattern.subn(_repl, content2)
-                        if n2 > 0:
-                            pyproject_path.write_text(new_content2)
-                            print(
-                                f"Updated dayhoff-tools constraint in {pyproject_path} to '{new_constraint_text}'"
-                            )
-                        else:
-                            print(
-                                f"Warning: Could not find dayhoff-tools dependency line in {manifest_path_for_constraint} or {pyproject_path} to update constraint."
-                            )
+            new_constraint_text = f">={locked_version}"
+
+            def _repl(match: re.Match):
+                prefix = match.group(1)
+                extras = match.group(2) or ""
+                suffix = match.group(3)
+                return f"{prefix}{package_name}{extras}{new_constraint_text}{suffix}"
+
+            # Update all manifest files
+            updated_files = []
+            for manifest_file in manifest_files_to_update:
+                try:
+                    print(f"Updating {manifest_file} version constraint...")
+                    content = manifest_file.read_text()
+                    new_content, num_replacements = pattern.subn(_repl, content)
+                    if num_replacements > 0:
+                        manifest_file.write_text(new_content)
+                        print(
+                            f"Updated dayhoff-tools constraint in {manifest_file} to '{new_constraint_text}'"
+                        )
+                        updated_files.append(str(manifest_file))
                     else:
                         print(
-                            f"Warning: Could not find dayhoff-tools dependency line in {manifest_path_for_constraint} to update constraint."
+                            f"Warning: Could not find dayhoff-tools dependency line in {manifest_file}"
                         )
-            except FileNotFoundError:
-                print(f"Error: {manifest_path_for_constraint} not found.")
-                return
-            except Exception as e:
-                print(f"Error updating {manifest_path_for_constraint}: {e}")
-                print("Proceeding with sync despite pyproject.toml update error.")
+                except FileNotFoundError:
+                    print(f"Warning: {manifest_file} not found.")
+                except Exception as e:
+                    print(f"Error updating {manifest_file}: {e}")
+
+            if not updated_files:
+                print(
+                    "Warning: No manifest files were successfully updated with dayhoff-tools constraint."
+                )
+                print("Proceeding with sync despite manifest update failures.")
 
         # Step 3: Sync environment
         print("Syncing environment with updated lock file...")
@@ -584,7 +602,7 @@ def update_dependencies(
             print("All dependencies updated and environment synced successfully.")
         else:  # Default case (dayhoff update)
             print(
-                "dayhoff-tools updated, pyproject.toml modified, and environment synced successfully."
+                "dayhoff-tools updated, manifest files modified, and environment synced successfully."
             )
 
     except subprocess.CalledProcessError as e:

{dayhoff_tools-1.7.5 → dayhoff_tools-1.8.0}/dayhoff_tools/warehouse.py

@@ -19,7 +19,9 @@ def _find_project_root() -> Path | None:
     """
     current_dir = Path.cwd().resolve()
     while current_dir != current_dir.parent:
-        if (current_dir / ".git").is_dir() or (current_dir / "pyproject.toml").is_file():
+        if (current_dir / ".git").is_dir() or (
+            current_dir / "pyproject.toml"
+        ).is_file():
             return current_dir
         current_dir = current_dir.parent
     # Check the final directory in the hierarchy (e.g., '/')

{dayhoff_tools-1.7.5 → dayhoff_tools-1.8.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.7.5"
+version = "1.8.0"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}