suite-py 1.49.1__py3-none-any.whl → 1.50.0__py3-none-any.whl

suite_py/__version__.py

@@ -1,2 +1,2 @@
 # -*- encoding: utf-8 -*-
-__version__ = "1.49.1"
+__version__ = "1.50.0"

suite_py/cli.py

@@ -233,21 +233,21 @@ def bump(obj: Context, project: Optional[str] = None, version: Optional[str] = N
 @main.command(
     "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.option(
-    "--parent-branch",
+    "--branch-name",
     type=click.STRING,
-    help="Parent branch to create the new branch from",
+    help="Branch name template. Supports {card_id}, {type}, {summary} placeholders (ex. '{card_id}/{type}/{summary}')",
 )
+@click.option("--card", type=click.STRING, help="YouTrack card ID (ex. PRIMA-4423)")
 @click.option(
-    "--branch-name",
+    "--parent-branch",
     type=click.STRING,
-    help="Branch name template. Supports {card_id}, {type}, {summary} placeholders (ex. '{card_id}/{type}/{summary}')",
+    help="Parent branch to create the new branch from",
 )
 @click.pass_obj
 @catch_exceptions
@@ -255,10 +255,10 @@ def cli_create_branch(obj, card, autostash, parent_branch, branch_name):
     from suite_py.commands.create_branch import CreateBranch
 
     obj.call(CreateBranch).run(
-        card_id=card,
         autostash=autostash,
-        parent_branch=parent_branch,
         branch_name=branch_name,
+        card_id=card,
+        parent_branch=parent_branch,
     )
 
 

suite_py/commands/create_branch.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
 import sys
-
 import requests
 
 from suite_py.lib import logger, metrics
@@ -19,7 +18,7 @@ class CreateBranch:
     ):
         self._config = config
         self._git_handler = git_handler
-        self._youtrack = youtrack_handler
+        self._youtrack_handler = youtrack_handler
 
     @metrics.command("create-branch")
     def run(
@@ -41,9 +40,9 @@ class CreateBranch:
 
         try:
             if card_id:
-                issue = self._youtrack.get_issue(card_id)
+                issue = self._youtrack_handler.get_issue(card_id)
             else:
-                issue = self._youtrack.get_issue(self._ask_card())
+                issue = self._youtrack_handler.get_issue(self._ask_card_id())
         except Exception:
             logger.error(
                 "There was a problem retrieving the issue from YouTrack. Check that the issue number is correct"
@@ -52,11 +51,11 @@ class CreateBranch:
 
         self._checkout_branch(issue, autostash, parent_branch, branch_name)
 
-        user = self._youtrack.get_current_user()
-        self._youtrack.assign_to(issue["id"], user["login"])
+        user = self._youtrack_handler.get_current_user()
+        self._youtrack_handler.assign_to(issue["id"], user["login"])
 
         try:
-            self._youtrack.update_state(
+            self._youtrack_handler.update_state(
                 issue["id"], self._config.youtrack["picked_state"]
             )
         except requests.exceptions.HTTPError:
@@ -87,7 +86,7 @@ class CreateBranch:
             "Insert the YouTrack issue number:", self._config.user["default_slug"]
         )
 
-    def _ask_card(self):
+    def _ask_card_id(self):
         suggestions = self._get_card_suggestions()
         user_choice = (
             self._select_card(suggestions)
@@ -98,8 +97,9 @@ class CreateBranch:
 
     def _get_card_suggestions(self):
         try:
-            return self._youtrack.search_issues(
-                self._config.user["card_suggest_query"], 5
+            return self._youtrack_handler.search_issues(
+                self._config.user["card_suggest_query"],
+                self._config.user["card_suggestions_limit"],
             )
         except Exception:
             logger.warning(

suite_py/commands/open_pr.py

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 import sys
+from string import Template
 
 from github import GithubException
 
@@ -77,7 +78,10 @@ class OpenPR:
 
             default_title = self._youtrack.get_issue(youtrack_id)["summary"]
             title_without_prefix = _ask_for_title(default_title)
-            title = f"[{youtrack_id}]: {title_without_prefix}"
+
+            title = Template(self._config.user["pr_title_template"]).substitute(
+                card_id=youtrack_id, title=title_without_prefix
+            )
         else:
             logger.warning(
                 f"Creating pull request on the {self._project} project for the {self._branch_name} branch NOT linked to YouTrack card"

suite_py/commands/release.py

@@ -228,7 +228,11 @@ class Release:
     def _is_success(conclusions):
         return bool(conclusions) and (
             all(c == "success" for c in conclusions)
-            or ("success" in conclusions and not Release._any_failure(conclusions))
+            or (
+                "success" in conclusions
+                and not Release._any_failure(conclusions)
+                and "cancelled" not in conclusions
+            )
         )
 
     @staticmethod

suite_py/lib/config.py

@@ -36,11 +36,13 @@ class Config:
         conf["user"].setdefault("default_slug", "PRIMA-XXX")
         default_search = f"in:{conf['user']['default_slug'].split('-')[0]} #{{To Do}}"
         conf["user"].setdefault("card_suggest_query", default_search)
+        conf["user"].setdefault("card_suggestions_limit", 5)
         # This is in seconds
         conf["user"].setdefault("captainhook_timeout", 30)
         conf["user"].setdefault("captainhook_url", "https://captainhook.prima.it")
         conf["user"].setdefault("use_commits_in_pr_body", False)
         conf["user"].setdefault("frequent_reviewers_max_number", 5)
+        conf["user"].setdefault("pr_title_template", "[$card_id]: $title")
 
         conf["youtrack"].setdefault("add_reviewers_tags", True)
         conf["youtrack"].setdefault("default_issue_type", "Task")

{suite_py-1.49.1.dist-info → suite_py-1.50.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: suite-py
-Version: 1.49.1
+Version: 1.50.0
 Summary: 
 Author: larrywax, EugenioLaghi, michelangelomo
 Author-email: devops@prima.it

{suite_py-1.49.1.dist-info → suite_py-1.50.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
 suite_py/__init__.py,sha256=REmi3D0X2G1ZWnYpKs8Ffm3NIj-Hw6dMuvz2b9NW344,142
-suite_py/__version__.py,sha256=VeDjrisUW4YqNSxqHjb9wWGHToZW1js3I9jRqyYdTYI,49
-suite_py/cli.py,sha256=IV73nNqBwLKLAfucLxyIne_V7uBQT6OBY3Z2VryQt2M,12582
+suite_py/__version__.py,sha256=38W7jlGbYwxo07w_vLhpzv02ReQdpK1kDEMKK2DCpHA,49
+suite_py/cli.py,sha256=wTV-d7Yq52JjkugxVCGCHM9Qsb3vKDv3VnTIJNJ162c,12579
 suite_py/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 suite_py/commands/ask_review.py,sha256=yN__Ac-fiZBPShjRDhyCCQZGfVlQE16KozoJk4UtiNw,3788
 suite_py/commands/bump.py,sha256=oFZU1hPfD11ujFC5G7wFyQOf2alY3xp2SO1h1ldjf3s,5406
 suite_py/commands/check.py,sha256=jCX59g6DgTA55yD_75mgcqJ5zCjRwl_eIRGDeUFjUWY,3316
 suite_py/commands/common.py,sha256=aWCEvO3hqdheuMUmZcHuc9EGZPQTk7VkzkHJk283MxQ,566
 suite_py/commands/context.py,sha256=NAMZjJtTIi8xKIhdWEYNKwz0f4wUubW2eAj08gxRRbw,1267
-suite_py/commands/create_branch.py,sha256=eilFIsCkMjU51maeJlMMMMBpnM6rlUauXIFA-92j7no,5277
+suite_py/commands/create_branch.py,sha256=HuNA5DR-9d-yupBCljxYasElwxwlP3XI_UyairnfurU,5397
 suite_py/commands/estimate_cone.py,sha256=_RekBWzPlzInlZRpSIeKUVkx-A8Phx0IEYVouTbN7z4,3411
 suite_py/commands/login.py,sha256=A59e1HsbN7Ocv2L_2H0Eb7MZK7AzLkLb72QxBthnIqU,258
 suite_py/commands/merge_pr.py,sha256=fXIE8mT9MjvvpqE-uVdXGBVFGhn0eQzcBxNr-N8SyAY,5171
-suite_py/commands/open_pr.py,sha256=djaF2OsYbQo0YLTEbNRTYYFzsNT0sl7VRxqtxSX1PKc,7150
+suite_py/commands/open_pr.py,sha256=yys08FIHBbajmKTT6p_JWHu6Y9y2JKI43MKXQ-iIQ-A,7275
 suite_py/commands/project_lock.py,sha256=b7OkGysue_Sl13VIT7B5CTBppCvrB_Q6iC0IJRBSHp8,1909
-suite_py/commands/release.py,sha256=eg9RoCBj5NVfaxQW7eHF4TvPj_eherJ-ovokU7Pt4k0,14659
+suite_py/commands/release.py,sha256=_pH1YxrK-8M2vi7Bed0hGn53esTHQDQYKyquPDZ8RlI,14756
 suite_py/commands/set_token.py,sha256=fehIqKjKhE-BJGFhgkPTo3Ntr0MvpgLd6EC5yjKuRs8,1508
 suite_py/commands/status.py,sha256=0JUK53_d1-U3WNS742JD2QTiGmCGZONo3jJx8WR7q70,1122
 suite_py/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-suite_py/lib/config.py,sha256=52YV0K0GK1WRbeM70IDXkpG8oZD1Zvxipn1b-XekwNA,3907
+suite_py/lib/config.py,sha256=x4tJxm7IjyEkBSybD8hxYfi365qbaIFsMaoBw6yJb6I,4043
 suite_py/lib/handler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 suite_py/lib/handler/aws_handler.py,sha256=dRvRDicikfRbuFtCLPbevaX-yC-fO4LwXFdyqLPJ8OI,8815
 suite_py/lib/handler/captainhook_handler.py,sha256=R30_Vvh2ck7fM5fwbpm3UV_FtlQr2xnx6RJpkG1Gn14,2983
@@ -40,7 +40,7 @@ suite_py/lib/requests/session.py,sha256=P32H3cWnCWunu91WIj2iDM5U3HzaBglg60VN_C9J
 suite_py/lib/symbol.py,sha256=z3QYBuNIwD3qQ3zF-cLOomIr_-C3bO_u5UIDAHMiyTo,60
 suite_py/lib/tokens.py,sha256=4DbsHDFLIxs40t3mRw_ZyhmejZQ0Bht7iAL8dTCTQd4,5458
 suite_py/templates/login.html,sha256=fJLls2SB84oZTSrxTdA5q1PqfvIHcCD4fhVWfyco7Ig,861
-suite_py-1.49.1.dist-info/METADATA,sha256=9VplRO35M4_maBHOmHZCRRNR4Us5JQOWLidhFq9jvZY,1250
-suite_py-1.49.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-suite_py-1.49.1.dist-info/entry_points.txt,sha256=dVKLC-9Infy-dHJT_MkK6LcDjOgBCJ8lfPkURJhBjxE,46
-suite_py-1.49.1.dist-info/RECORD,,
+suite_py-1.50.0.dist-info/METADATA,sha256=E2McUnkrL3Q3OC1hP4rrm2h8NMBdWqPKTUuKdmFZya8,1250
+suite_py-1.50.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+suite_py-1.50.0.dist-info/entry_points.txt,sha256=dVKLC-9Infy-dHJT_MkK6LcDjOgBCJ8lfPkURJhBjxE,46
+suite_py-1.50.0.dist-info/RECORD,,