package-dev-tools 0.8.6__tar.gz → 0.8.8__tar.gz

{package_dev_tools-0.8.6 → package_dev_tools-0.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: package-dev-tools
-Version: 0.8.6
+Version: 0.8.8
 Summary: CI/CD tools for Python packages
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Source Code, https://github.com/quintenroets/package-dev-tools
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: package-utils<1,>=0.8.4
+Requires-Dist: package-utils<1,>=0.9.0
 Requires-Dist: packaging<27,>=23.2
 Requires-Dist: powercli<1,>=0.4.0
 Requires-Dist: pygithub<3,>=2.1.1
@@ -16,7 +16,7 @@ Requires-Dist: python-slugify<9,>=8.0.1
 Requires-Dist: PyYaml<7,>=6.0.1
 Requires-Dist: requests<3,>=2.31.0
 Requires-Dist: simple-classproperty<5,>=4.0.2
-Requires-Dist: superpathlib<3,>=2.0.12
+Requires-Dist: superpathlib<3,>=2.1.0
 Requires-Dist: autotyping<25,>=23.3.0
 Requires-Dist: bump2version<2,>=1.0.1
 Requires-Dist: coverage<8,>=7.4.0
@@ -28,7 +28,7 @@ Requires-Dist: ruff<0.17,>=0.16.3
 Provides-Extra: dev
 Requires-Dist: hypothesis<7,>=6.91.0; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
-Requires-Dist: package-utils[context]<1,>=0.8.4; extra == "dev"
+Requires-Dist: package-utils[context]<1,>=0.9.0; extra == "dev"
 Requires-Dist: types-requests<3,>=2.31.0.10; extra == "dev"
 Dynamic: license-file
 

{package_dev_tools-0.8.6 → package_dev_tools-0.8.8}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "package-dev-tools"
-version = "0.8.6"
+version = "0.8.8"
 description = "CI/CD tools for Python packages"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = "MIT"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "package-utils >=0.8.4, <1",
+    "package-utils >=0.9.0, <1",
     "packaging >=23.2, <27",
     "powercli >=0.4.0, <1",
     "pygithub >=2.1.1, <3",
@@ -15,7 +15,7 @@ dependencies = [
     "PyYaml >=6.0.1, <7",
     "requests >=2.31.0, <3",
     "simple-classproperty >=4.0.2, <5",
-    "superpathlib >=2.0.12, <3",
+    "superpathlib >=2.1.0, <3",
 
     # pre-commit binaries
     "autotyping >=23.3.0, <25",
@@ -34,7 +34,7 @@ dependencies = [
 dev = [
     "hypothesis >=6.91.0, <7",
     "package-dev-utils >=0.1.6, <1",
-    "package-utils[context] >=0.8.4, <1",
+    "package-utils[context] >=0.9.0, <1",
 
     # mypy
     "types-requests >=2.31.0.10, <3",

{package_dev_tools-0.8.6 → package_dev_tools-0.8.8}/src/package_dev_tools/actions/template_sync/merge.py

@@ -59,7 +59,7 @@ class Merger:  # pragma: nocover
         for relative_file in self.generate_project_files():
             file = source / relative_file
             destination_file = destination / relative_file
-            file.copy_to(destination_file, include_properties=False)
+            destination_file.byte_content = file.byte_content if file.exists() else b""
 
     def generate_project_files(self) -> Iterator[Path]:
         path = models.Path(self.repository_directory)

{package_dev_tools-0.8.6 → package_dev_tools-0.8.8}/src/package_dev_tools/utils/git.py

@@ -1,29 +1,17 @@
 import os
 import shlex
 import shutil
-import subprocess
 from collections.abc import Iterator
 from dataclasses import dataclass, field
 from functools import cache
 from typing import Any
 
-from cli.commands.run import CommandItem
-from cli.commands.runner import Runner
+import cli
+from cli.commands.commands import CommandItem
 
 from package_dev_tools.models import Path
 
 
-@cache
-def resolve_git_binary() -> str:
-    paths = (
-        path
-        for p in os.get_exec_path()
-        if (path := shutil.which("git", path=str(p)))
-        and not path.startswith(str(Path.home()))
-    )
-    return shlex.quote(next(paths, shutil.which("git") or "git"))
-
-
 @dataclass
 class GitInterface:
     path: Path = field(default_factory=Path.cwd)
@@ -48,20 +36,21 @@ class GitInterface:
         return (Path(relative_path) for relative_path in output.splitlines())
 
     def capture_output(self, *args: CommandItem, **kwargs: Any) -> str:
-        return self.create_runner(*args, **kwargs).capture_output()
-
-    def run(
-        self,
-        *args: CommandItem,
-        check: bool = True,
-    ) -> subprocess.CompletedProcess[str]:  # pragma: nocover
-        return self.create_runner(*args, check=check).run()
-
-    def create_runner(self, *args: CommandItem, **kwargs: Any) -> Runner[str]:
         git_args = f"{resolve_git_binary()} {args[0]}", *args[1:]
-        return Runner[str](git_args, kwargs={"cwd": self.path, **kwargs})
+        return cli.capture_output(*git_args, cwd=self.path, **kwargs)
 
     def configure(self) -> None:
         git_configuration = {"name": self.git_name, "email": self.git_email}
         for attribute, value in git_configuration.items():
             self.capture_output(f"config user.{attribute} {value}")
+
+
+@cache
+def resolve_git_binary() -> str:
+    paths = (
+        path
+        for p in os.get_exec_path()
+        if (path := shutil.which("git", path=str(p)))
+        and not path.startswith(str(Path.home()))
+    )
+    return shlex.quote(next(paths, shutil.which("git") or "git"))

{package_dev_tools-0.8.6 → package_dev_tools-0.8.8}/src/package_dev_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: package-dev-tools
-Version: 0.8.6
+Version: 0.8.8
 Summary: CI/CD tools for Python packages
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Source Code, https://github.com/quintenroets/package-dev-tools
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: package-utils<1,>=0.8.4
+Requires-Dist: package-utils<1,>=0.9.0
 Requires-Dist: packaging<27,>=23.2
 Requires-Dist: powercli<1,>=0.4.0
 Requires-Dist: pygithub<3,>=2.1.1
@@ -16,7 +16,7 @@ Requires-Dist: python-slugify<9,>=8.0.1
 Requires-Dist: PyYaml<7,>=6.0.1
 Requires-Dist: requests<3,>=2.31.0
 Requires-Dist: simple-classproperty<5,>=4.0.2
-Requires-Dist: superpathlib<3,>=2.0.12
+Requires-Dist: superpathlib<3,>=2.1.0
 Requires-Dist: autotyping<25,>=23.3.0
 Requires-Dist: bump2version<2,>=1.0.1
 Requires-Dist: coverage<8,>=7.4.0
@@ -28,7 +28,7 @@ Requires-Dist: ruff<0.17,>=0.16.3
 Provides-Extra: dev
 Requires-Dist: hypothesis<7,>=6.91.0; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
-Requires-Dist: package-utils[context]<1,>=0.8.4; extra == "dev"
+Requires-Dist: package-utils[context]<1,>=0.9.0; extra == "dev"
 Requires-Dist: types-requests<3,>=2.31.0.10; extra == "dev"
 Dynamic: license-file
 

{package_dev_tools-0.8.6 → package_dev_tools-0.8.8}/src/package_dev_tools.egg-info/requires.txt

@@ -1,4 +1,4 @@
-package-utils<1,>=0.8.4
+package-utils<1,>=0.9.0
 packaging<27,>=23.2
 powercli<1,>=0.4.0
 pygithub<3,>=2.1.1
@@ -6,7 +6,7 @@ python-slugify<9,>=8.0.1
 PyYaml<7,>=6.0.1
 requests<3,>=2.31.0
 simple-classproperty<5,>=4.0.2
-superpathlib<3,>=2.0.12
+superpathlib<3,>=2.1.0
 autotyping<25,>=23.3.0
 bump2version<2,>=1.0.1
 coverage<8,>=7.4.0
@@ -19,5 +19,5 @@ ruff<0.17,>=0.16.3
 [dev]
 hypothesis<7,>=6.91.0
 package-dev-utils<1,>=0.1.6
-package-utils[context]<1,>=0.8.4
+package-utils[context]<1,>=0.9.0
 types-requests<3,>=2.31.0.10