Merged in bugfix/pipeline-changelog-generation (pull request #24)

bugfix: pipeline changelog generation

Approved-by: Jonathan Teran

pyproject.toml

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
+requires = ["setuptools >= 80", "setuptools-scm[simple] >= 8" ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "git-flow"
 description = "Git workflow automation to follow best practices"
-version = "v1.0.0"
+dynamic = ["version"]
 requires-python = ">= 3.12"
 dependencies = [
     "requests"

src/git_flow/main.py

@@ -257,7 +257,7 @@ def merge_command():
     print("Cambios a mergear:")
 
     for commit in commits:
-        if commit != Git.UPDATED_CHANGELOG_MSG:
+        if commit != Git.BUMP_VERSION:
             print("- " + commit)
 
     merge_conflicts = Git("merge", target, ff=False, commit=False).exec()
@@ -404,9 +404,10 @@ def tag_command():
             [service, repository] = parse_url(url)
             create_tag(service, repository, token, new_version, commit)
 
-        if update_changelog(merged_branch, branch):
+        merged_commit = Git("show", "HEAD^2", patch=False, format="%H").firstline()
+        if update_changelog(merged_commit, branch):
             Git("add", Git.CHANGELOG_FILE).exec()
-            Git("commit", message=Git.UPDATED_CHANGELOG_MSG).exec()
+            Git("commit", message=Git.BUMP_VERSION).exec()
             Git("push").exec()
     else:
         Git("tag", new_version, commit).exec()
@@ -523,7 +524,7 @@ def get_unique_branch_name(branch_type):
 def update_changelog(branch: str, target: str):
     last_commit = Git("show", "HEAD", no_patch=True, format="%s").firstline()
 
-    if last_commit == Git.UPDATED_CHANGELOG_MSG:
+    if last_commit == Git.BUMP_VERSION:
         return False
     else:
         content = generate_changelog_entry(branch, target)
@@ -568,14 +569,14 @@ def get_changelog_content_lines(branch: str, target: str):
         email = Git("show", commit, patch=False, format="%ae").firstline()
         username = email[:email.index('@')]
 
-        if message == Git.UPDATED_CHANGELOG_MSG:
+        if message == Git.BUMP_VERSION:
             continue
 
         index = message.index(":")
         commit_type = message[:index]
         commit_message = message[index+1:]
 
-        lines.append(f"- **{commit_type}**: {commit_message} por [{username}]({email}) ({commit})")
+        lines.append(f"- **{commit_type}**: {commit_message} [[{username}](mailto:{email})] ({commit})")
 
     return lines
 
@@ -598,7 +599,7 @@ def generate_changelog_entry(branch: str, target: str):
 def create_pull_request(service: str, repository: str, source: str, destination: str):
     endpoint = get_api_endpoint(service, repository, "/pullrequests")
     title = source.replace("/", ": ").replace("-", " ")
-    description = "\n".join(get_changelog_content_lines(destination))
+    description = "\n".join(get_changelog_content_lines(source, destination))
     headers = get_headers()
 
     json = {