patch-package-py 0.1.0__tar.gz → 0.1.2__tar.gz

{patch_package_py-0.1.0 → patch_package_py-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patch-package-py
-Version: 0.1.0
+Version: 0.1.2
 Summary: patch 3rd party Python packages
 Project-URL: Homepage, https://github.com/nomyfan/patch-package-py
 Project-URL: Repository, https://github.com/nomyfan/patch-package-py

{patch_package_py-0.1.0 → patch_package_py-0.1.2}/patch_package_py/cli.py

@@ -62,10 +62,7 @@ def cmd_apply(args):
     site_packages_dir = find_site_packages(Path.cwd() / ".venv")
 
     if not patches_dir.exists():
-        logger.error(
-            f"Error: Patches directory {patches_dir} does not exist",
-        )
-        sys.exit(1)
+        return
 
     if not site_packages_dir.exists():
         logger.error(
@@ -79,15 +76,8 @@ def cmd_apply(args):
         logger.info(f"No patch files found in {patches_dir}")
         return
 
-    success_count = 0
     for patch_file in patch_files:
-        try:
-            apply_patch(patch_file, site_packages_dir)
-            success_count += 1
-        except Exception as e:
-            logger.error(f"✗ Failed to apply {patch_file.name}: {e}")
-
-    logger.info(f"Applied {success_count}/{len(patch_files)} patches successfully")
+        apply_patch(patch_file, site_packages_dir)
 
 
 def cli():

{patch_package_py-0.1.0 → patch_package_py-0.1.2}/patch_package_py/core.py

@@ -32,6 +32,11 @@ class Resolver:
         self, venv: Path, package_name: str
     ) -> tuple[PurePosixPath, str] | None:
         site_packages_path = find_site_packages(venv)
+        return self.resolve_in_site_packages(site_packages_path, package_name)
+
+    def resolve_in_site_packages(
+        self, site_packages_path: Path, package_name: str
+    ) -> tuple[PurePosixPath, str] | None:
         dist_info = list(
             site_packages_path.glob(f"{package_name.replace('-', '_')}-*.dist-info")
         )
@@ -90,12 +95,10 @@ def prepare_patch_workspace(
     venv_path = temp_dir / "venv"
 
     # Create venv with uv using current Python version
-    subprocess.run(
-        ["uv", "venv", str(venv_path), "--python", sys.executable], check=True
-    )
+    subprocess.check_call(["uv", "venv", str(venv_path), "--python", sys.executable])
 
     # Install the package without dependencies using uv
-    subprocess.run(
+    subprocess.check_call(
         [
             "uv",
             "pip",
@@ -107,7 +110,6 @@ def prepare_patch_workspace(
                 venv_path / ("Scripts/python.exe" if os.name == "nt" else "bin/python")
             ),
         ],
-        check=True,
         cwd=temp_dir,
     )
 
@@ -145,14 +147,19 @@ def prepare_patch_workspace(
             f,
             indent=2,
         )
-    subprocess.run(["git", "init"], cwd=git_path, check=True, capture_output=True)
-    subprocess.run(
+    subprocess.check_call(
+        ["git", "init"],
+        cwd=git_path,
+        stderr=subprocess.DEVNULL,
+        stdout=subprocess.DEVNULL,
+    )
+    subprocess.check_call(
         ["git", "add", "."],
         cwd=git_path,
-        check=True,
-        capture_output=True,
+        stderr=subprocess.DEVNULL,
+        stdout=subprocess.DEVNULL,
     )
-    subprocess.run(
+    subprocess.check_call(
         [
             "git",
             "commit",
@@ -161,8 +168,8 @@ def prepare_patch_workspace(
             f"Initial commit of {package_name}=={version}",
         ],
         cwd=git_path,
-        check=True,
-        capture_output=True,
+        stderr=subprocess.DEVNULL,
+        stdout=subprocess.DEVNULL,
     )
 
     logger.info(
@@ -171,15 +178,12 @@ def prepare_patch_workspace(
 
 
 def commit_changes(package_name: str, version: str, site_packages_path: Path) -> None:
-    diff_proc = subprocess.run(
+    diff_content = subprocess.check_output(
         ["git", "diff", "--relative"],
         cwd=site_packages_path,
-        check=True,
-        capture_output=True,
         text=True,
     )
 
-    diff_content = diff_proc.stdout
     if not diff_content:
         logger.info("No changes detected, nothing to commit.")
         return
@@ -190,8 +194,9 @@ def commit_changes(package_name: str, version: str, site_packages_path: Path) ->
     with open(patch_file_path, "w") as f:
         f.write(diff_content)
 
+    current_site_packages = find_site_packages(Path.cwd() / ".venv")
     try:
-        apply_patch(patch_file_path, site_packages_path)
+        apply_patch(patch_file_path, current_site_packages)
     except subprocess.CalledProcessError:
         logger.error(
             f"Error: failed to apply the patch after creation. There's maybe a conflict, you can try to reinstall the package and apply the patch manually via `{CLI_NAME} apply {patch_file_name}`"
@@ -201,9 +206,33 @@ def commit_changes(package_name: str, version: str, site_packages_path: Path) ->
 
 
 def apply_patch(patch_file: Path, site_packages_dir: Path) -> None:
+    # Parse package name and version from patch file name
+    patch_name = patch_file.stem  # Remove .patch extension
+    if "+" not in patch_name:
+        raise ValueError(
+            f"Invalid patch file name format: {patch_file.name}. Expected format: package_name+version.patch"
+        )
+
+    package_name, version = patch_name.rsplit("+", 1)
+
+    # Verify the package exists in site_packages_dir with matching version
+    resolver = Resolver()
+    result = resolver.resolve_in_site_packages(site_packages_dir, package_name)
+    if result is None:
+        logger.warning(
+            f"Package '{package_name}' not found in site-packages directory, skipping..."
+        )
+        return
+
+    _, installed_version = result
+    if installed_version != version:
+        raise ValueError(
+            f"Version mismatch: patch is for {package_name}=={version} but installed version is {installed_version}"
+        )
+
     # First, check if the patch is already applied using dry-run
     try:
-        subprocess.run(
+        subprocess.check_call(
             [
                 "patch",
                 "-p1",
@@ -214,17 +243,17 @@ def apply_patch(patch_file: Path, site_packages_dir: Path) -> None:
                 str(patch_file.absolute()),
             ],
             cwd=site_packages_dir,
-            check=True,
-            capture_output=True,
+            stderr=subprocess.DEVNULL,
+            stdout=subprocess.DEVNULL,
         )
     except subprocess.CalledProcessError:
         logger.warning(
-            f"Patch `{patch_file.stem}` appears to be already applied, skipping...",
+            f"Patch `{patch_name}` appears to be already applied, skipping...",
         )
         return
 
     # If dry-run succeeds, apply the patch for real
-    subprocess.run(
+    subprocess.check_call(
         [
             "patch",
             "-p1",
@@ -234,5 +263,4 @@ def apply_patch(patch_file: Path, site_packages_dir: Path) -> None:
             str(patch_file.absolute()),
         ],
         cwd=site_packages_dir,
-        check=True,
     )

{patch_package_py-0.1.0 → patch_package_py-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "patch-package-py"
-version = "0.1.0"
+version = "0.1.2"
 description = "patch 3rd party Python packages"
 readme = "README.md"
 requires-python = ">=3.9"

{patch_package_py-0.1.0 → patch_package_py-0.1.2}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "patch-package-py"
-version = "0.1.0"
+version = "0.1.2"
 source = { editable = "." }
 
 [package.dev-dependencies]