Compare commits

...
6 Commits
Author SHA1 Message Date
JonathanGitFlowandjt 1c703f285e Merged in bugfix/changelog-username-links (pull request #23)
bugfix: changelog username links

Approved-by: Jonathan Teran
2025-11-08 00:20:51 +00:00
jt 9799df2147 bugfix: arreglo generacion de links en changelog entries 2025-11-07 21:20:22 -03:00
JonathanGitFlowandjt 49642cfb71 Merged in refactor/build-dynamic-version (pull request #22)
refactor: build dynamic version

Approved-by: Jonathan Teran
2025-11-08 00:10:48 +00:00
jt 3e01b11c09 bugfix: arreglo parametro target a get_changelog_entry_lines 2025-11-07 21:06:56 -03:00
jt 6d390376d8 bugfix: renombro variable UPDATED_CHANGELOG_FILE a BUMP_VERSION 2025-11-07 21:05:33 -03:00
jt 10c1d54c2d refactor: modifico pyproject.toml para usar tag de git como version 2025-11-07 21:03:34 -03:00
2 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -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"
+6 -6
View File
@@ -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,14 +568,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 +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 = {