From 10c1d54c2dff98313112706c1de26943a3890481 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Fri, 7 Nov 2025 21:03:34 -0300 Subject: [PATCH 1/3] refactor: modifico pyproject.toml para usar tag de git como version --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bdb35a0..0f43da1 100644 --- a/pyproject.toml +++ b/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" From 6d390376d899a1b9f7eb1708a4fea0b3decc8291 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Fri, 7 Nov 2025 21:05:33 -0300 Subject: [PATCH 2/3] bugfix: renombro variable UPDATED_CHANGELOG_FILE a BUMP_VERSION --- src/git_flow/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/git_flow/main.py b/src/git_flow/main.py index cb06bb4..4e72f84 100755 --- a/src/git_flow/main.py +++ b/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() @@ -406,7 +406,7 @@ def tag_command(): if update_changelog(merged_branch, 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 +523,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,7 +568,7 @@ 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(":") From 3e01b11c09c58858ce199a1a56d115c5f4d4daa3 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Fri, 7 Nov 2025 21:06:56 -0300 Subject: [PATCH 3/3] bugfix: arreglo parametro target a get_changelog_entry_lines --- src/git_flow/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git_flow/main.py b/src/git_flow/main.py index 4e72f84..b1f5dd5 100755 --- a/src/git_flow/main.py +++ b/src/git_flow/main.py @@ -598,7 +598,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 = {