dayhoff-tools 1.11.3__tar.gz → 1.11.4__tar.gz

{dayhoff_tools-1.11.3 → dayhoff_tools-1.11.4}/PKG-INFO

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

{dayhoff_tools-1.11.3 → dayhoff_tools-1.11.4}/dayhoff_tools/cli/utility_commands.py

@@ -219,6 +219,7 @@ def build_and_upload_wheel(bump_part: str = "patch"):
         # Build wheel and sdist
         # UV expects pyproject.toml, so temporarily copy the platform manifest
         backup_created = False
+        temp_pyproject_created = False
         if pyproject_path != "pyproject.toml":
             if Path("pyproject.toml").exists():
                 Path("pyproject.toml").rename("pyproject.toml.build.bak")
@@ -226,48 +227,53 @@ def build_and_upload_wheel(bump_part: str = "patch"):
             Path(pyproject_path).read_text()
             with open("pyproject.toml", "w") as f:
                 f.write(Path(pyproject_path).read_text())
+            temp_pyproject_created = True
 
-        build_cmd = ["uv", "build"]
-        # Print command in blue
-        print(f"Running command: {BLUE}{' '.join(build_cmd)}{RESET}")
-        subprocess.run(build_cmd, check=True)
-
-        # Restore original state
-        if pyproject_path != "pyproject.toml":
-            Path("pyproject.toml").unlink()
-            if backup_created:
-                Path("pyproject.toml.build.bak").rename("pyproject.toml")
-
-        # Upload using uv publish with explicit arguments
-        # Print masked command in blue
-        print(f"Running command: {BLUE}{' '.join(publish_cmd_safe_print)}{RESET}")
-        subprocess.run(
-            publish_cmd,  # Use the actual command with token
-            check=True,
-        )
+        try:
+            build_cmd = ["uv", "build"]
+            # Print command in blue
+            print(f"Running command: {BLUE}{' '.join(build_cmd)}{RESET}")
+            subprocess.run(build_cmd, check=True)
+
+            # Upload using uv publish with explicit arguments
+            # Print masked command in blue
+            print(f"Running command: {BLUE}{' '.join(publish_cmd_safe_print)}{RESET}")
+            subprocess.run(
+                publish_cmd,  # Use the actual command with token
+                check=True,
+            )
 
-        print(f"Successfully built and uploaded version {new_version} to PyPI")
+            print(f"Successfully built and uploaded version {new_version} to PyPI")
 
-        # Re-install DHT in current venv when building from DHT itself
-        try:
-            proj_name = None
+            # Re-install DHT in current venv when building from DHT itself
+            # (Keep temp pyproject.toml until after this step)
             try:
-                proj_toml = toml.load(pyproject_path)
-                proj_name = (
-                    proj_toml.get("project", {}).get("name")
-                    if isinstance(proj_toml, dict)
-                    else None
-                )
-            except Exception:
-                pass
-            if proj_name == "dayhoff-tools":
-                print("Re-installing dayhoff-tools into the active environment…")
-                reinstall_cmd = ["uv", "pip", "install", "-e", ".[full]"]
-                print(f"Running command: {BLUE}{' '.join(reinstall_cmd)}{RESET}")
-                subprocess.run(reinstall_cmd, check=True)
-                print("dayhoff-tools reinstalled in the current environment.")
-        except subprocess.CalledProcessError as e:
-            print(f"Warning: Failed to reinstall dayhoff-tools locally: {e}")
+                proj_name = None
+                try:
+                    proj_toml = toml.load(pyproject_path)
+                    proj_name = (
+                        proj_toml.get("project", {}).get("name")
+                        if isinstance(proj_toml, dict)
+                        else None
+                    )
+                except Exception:
+                    pass
+                if proj_name == "dayhoff-tools":
+                    print("Re-installing dayhoff-tools into the active environment…")
+                    reinstall_cmd = ["uv", "pip", "install", "-e", ".[full]"]
+                    print(f"Running command: {BLUE}{' '.join(reinstall_cmd)}{RESET}")
+                    subprocess.run(reinstall_cmd, check=True)
+                    print("dayhoff-tools reinstalled in the current environment.")
+            except subprocess.CalledProcessError as e:
+                print(f"Warning: Failed to reinstall dayhoff-tools locally: {e}")
+
+        finally:
+            # Restore original state (always clean up, even if errors occurred)
+            if temp_pyproject_created:
+                if Path("pyproject.toml").exists():
+                    Path("pyproject.toml").unlink()
+                if backup_created and Path("pyproject.toml.build.bak").exists():
+                    Path("pyproject.toml.build.bak").rename("pyproject.toml")
 
     except FileNotFoundError:
         print(f"Error: {pyproject_path} not found.")

{dayhoff_tools-1.11.3 → dayhoff_tools-1.11.4}/pyproject.toml

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