suite-py 1.43.3__tar.gz → 1.44.0__tar.gz

{suite_py-1.43.3 → suite_py-1.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: suite-py
-Version: 1.43.3
+Version: 1.44.0
 Summary: 
 Author: larrywax, EugenioLaghi, michelangelomo
 Author-email: devops@prima.it
@@ -28,7 +28,7 @@ Requires-Dist: pytest (>=7.0.0)
 Requires-Dist: python-dateutil (>=2.8.2)
 Requires-Dist: requests (>=2.26.0)
 Requires-Dist: requests-toolbelt (>=0.9.1)
-Requires-Dist: rich (==13.9.4)
+Requires-Dist: rich (==14.0.0)
 Requires-Dist: semver (>=3.0.4,<4.0.0)
 Requires-Dist: termcolor (>=1.1.0)
 Requires-Dist: truststore (>=0.7,<0.11) ; python_version >= "3.10"

{suite_py-1.43.3 → suite_py-1.44.0}/pyproject.toml

@@ -2,7 +2,7 @@
 authors = ["larrywax, EugenioLaghi, michelangelomo <devops@prima.it>"]
 description = ""
 name = "suite-py"
-version = "1.43.3"
+version = "1.44.0"
 
 [tool.poetry.dependencies]
 Click = ">=7.0"
@@ -23,7 +23,7 @@ python = ">=3.8,<4.0"
 python-dateutil = ">=2.8.2"
 requests = ">=2.26.0"
 requests-toolbelt = ">=0.9.1"
-rich = "==13.9.4"
+rich = "==14.0.0"
 semver = "^3.0.4"
 termcolor = ">=1.1.0"
 truststore = {version = ">=0.7,<0.11", python = ">=3.10"}

{suite_py-1.43.3 → suite_py-1.44.0}/suite_py/__version__.py

@@ -1,2 +1,2 @@
 # -*- encoding: utf-8 -*-
-__version__ = "1.43.3"
+__version__ = "1.44.0"

{suite_py-1.43.3 → suite_py-1.44.0}/suite_py/cli.py

@@ -228,12 +228,17 @@ def bump(obj: Context, project: Optional[str] = None, version: Optional[str] = N
     "create-branch", help="Create local branch and set the YouTrack card in progress"
 )
 @click.option("--card", type=click.STRING, help="YouTrack card number (ex. PRIMA-123)")
+@click.option(
+    "--autostash",
+    is_flag=True,
+    help="Stash uncommitted changes before creating the branch and reapply them afterward",
+)
 @click.pass_obj
 @catch_exceptions
-def cli_create_branch(obj, card):
+def cli_create_branch(obj, card, autostash):
     from suite_py.commands.create_branch import CreateBranch
 
-    obj.call(CreateBranch, card=card).run()
+    obj.call(CreateBranch, card=card, autostash=autostash).run()
 
 
 @main.command("lock", help="Lock project on staging or prod")

{suite_py-1.43.3 → suite_py-1.44.0}/suite_py/commands/create_branch.py

@@ -11,16 +11,17 @@ from suite_py.lib.handler.youtrack_handler import YoutrackHandler
 
 
 class CreateBranch:
-    def __init__(self, project, card, config, tokens):
+    def __init__(self, project, card, config, tokens, autostash=False):
         self._project = project
         self._card = card
         self._config = config
         self._youtrack = YoutrackHandler(config, tokens)
         self._git = GitHandler(project, config)
+        self._autostash = autostash
 
     @metrics.command("create-branch")
     def run(self):
-        if not self._git.is_detached() and self._git.is_dirty():
+        if not self._git.is_detached() and self._git.is_dirty() and not self._autostash:
             # Default behaviour is to pull when not detached.
             # Can't do that with uncommitted changes.
             logger.error("You have some uncommitted changes, I can't continue")
@@ -37,7 +38,7 @@ class CreateBranch:
             )
             sys.exit(-1)
 
-        self._checkout_branch(issue)
+        self._checkout_branch(issue, self._autostash)
 
         user = self._youtrack.get_current_user()
         self._youtrack.assign_to(issue["id"], user["login"])
@@ -94,7 +95,7 @@ class CreateBranch:
             )
             return []
 
-    def _checkout_branch(self, issue):
+    def _checkout_branch(self, issue, autostash=False):
         default_parent_branch_name = self._config.user.get(
             "default_parent_branch", self._git.current_branch_name()
         )
@@ -118,9 +119,9 @@ class CreateBranch:
 
             logger.error(f"Invalid branch name: {full_branch_name}. Try again?")
 
-        self._git.checkout(parent_branch_name)
+        self._git.checkout(parent_branch_name, autostash=autostash)
 
-        self._git.checkout(full_branch_name, new=True)
+        self._git.checkout(full_branch_name, new=True, autostash=autostash)
 
 
 # Normalize a string into a valid segment(ie. the part of the branch name between the /)

{suite_py-1.43.3 → suite_py-1.44.0}/suite_py/lib/handler/git_handler.py

@@ -32,7 +32,7 @@ class GitHandler:
             check=True,
         )
 
-    def checkout(self, branch, new=False):
+    def checkout(self, branch, new=False, autostash=False):
         try:
             if new:
                 subprocess.run(
@@ -51,7 +51,7 @@ class GitHandler:
                     stderr=subprocess.DEVNULL,
                 )
                 if not self.is_detached():  # Skip pulling if detached
-                    self.pull(rebase=True)
+                    self.pull(rebase=True, autostash=autostash)
         except CalledProcessError as e:
             logger.error(f"Error during command execution: {e}")
             sys.exit(-1)
@@ -99,12 +99,16 @@ class GitHandler:
                 logger.error(f"Error during command execution: {e}")
                 sys.exit(-1)
 
-    def pull(self, rebase=False):
+    def pull(self, rebase=False, autostash=False):
         with Halo(text=f"Pulling {self._repo}...", spinner="dots", color="magenta"):
             try:
                 if rebase:
                     subprocess.run(
-                        ["git", "pull", "--rebase"],
+                        (
+                            ["git", "pull", "--rebase", "--autostash"]
+                            if autostash
+                            else ["git", "pull", "--rebase"]
+                        ),
                         cwd=self._path,
                         check=True,
                         stdout=subprocess.DEVNULL,
@@ -112,7 +116,11 @@ class GitHandler:
                     )
                 else:
                     subprocess.run(
-                        ["git", "pull"],
+                        (
+                            ["git", "pull", "--autostash"]
+                            if autostash
+                            else ["git", "pull"]
+                        ),
                         cwd=self._path,
                         check=True,
                         stdout=subprocess.DEVNULL,

{suite_py-1.43.3 → suite_py-1.44.0}/suite_py/lib/logger.py

@@ -17,7 +17,7 @@ def setup(verbose):
         level=level,
         format=LOG_FORMAT,
         datefmt="[%X]",
-        handlers=[RichHandler(rich_tracebacks=True, markup=False)],
+        handlers=[RichHandler(rich_tracebacks=True, markup=False, show_path=False)],
     )
 
     logger = logging.getLogger(LOGGER_NAME)