package-dev-tools 0.6.3__tar.gz → 0.6.4__tar.gz

{package_dev_tools-0.6.3 → package_dev_tools-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: package-dev-tools
-Version: 0.6.3
+Version: 0.6.4
 Summary: CI/CD tools for Python packages
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT

{package_dev_tools-0.6.3 → package_dev_tools-0.6.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "package-dev-tools"
-version = "0.6.3"
+version = "0.6.4"
 description = "CI/CD tools for Python packages"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = {text = "MIT"}

{package_dev_tools-0.6.3 → package_dev_tools-0.6.4}/src/package_dev_tools/actions/instantiate_new_project/git.py

@@ -1,3 +1,4 @@
+import subprocess
 from dataclasses import dataclass, field
 
 import cli
@@ -25,6 +26,14 @@ class GitInterface:
         git_arg = f"git {args[0]}"
         return cli.capture_output(git_arg, *args[1:], cwd=self.path)
 
+    def run(
+        self,
+        *args: CommandItem,
+        check: bool = True,
+    ) -> subprocess.CompletedProcess[str]:
+        git_arg = f"git {args[0]}"
+        return cli.run(git_arg, *args[1:], cwd=self.path, check=check)
+
     def configure(self) -> None:
         git_configuration = {"name": self.git_name, "email": self.git_email}
         for attribute, value in git_configuration.items():

{package_dev_tools-0.6.3 → package_dev_tools-0.6.4}/src/package_dev_tools/actions/template_sync/merge.py

@@ -27,7 +27,7 @@ class Merger:  # pragma: nocover
     def merge_in_template_updates(self) -> None:
         self.branch_template_updates()
         self.create_branch_with(self.repository_directory)
-        self.git.capture_output(f"merge {self.template_branch} -X ours -m 'merge'")
+        self.git.run(f"merge {self.template_branch} -X ours -m 'merge'", check=False)
         self.overwrite_project_files(self.template_directory, self.repository_directory)
 
     def branch_template_updates(self) -> None:

{package_dev_tools-0.6.3 → package_dev_tools-0.6.4}/src/package_dev_tools/actions/template_sync/sync.py

@@ -153,7 +153,7 @@ class TemplateSyncer(git.Client):  # pragma: nocover
         )
         cli.run("git", clone, self.project_clone_url, path)
         if not update_branch_exists:
-            self.run_git("checkout", "-b", self.update_branch)
+            cli.run("git checkout -b", self.update_branch, cwd=path)
 
     @property
     def project_clone_url(self) -> str:

{package_dev_tools-0.6.3 → package_dev_tools-0.6.4}/src/package_dev_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: package-dev-tools
-Version: 0.6.3
+Version: 0.6.4
 Summary: CI/CD tools for Python packages
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT