jt/git-flow
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in refactor/build-dynamic-version (pull request #22)

Browse Source 
refactor: build dynamic version

Approved-by: Jonathan Teran
This commit is contained in:
JonathanGitFlow
2025-11-08 00:10:48 +00:00
committed by jt
parent cb70ab9b07 3e01b11c09
commit 49642cfb71
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyproject.toml
+2 -2
View File
@@ -1,11 +1,11 @@
[build-system] [build-system]
requires = ["setuptools >= 61.0"] requires = ["setuptools >= 80", "setuptools-scm[simple] >= 8" ]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"
[project] [project]
name = "git-flow" name = "git-flow"
description = "Git workflow automation to follow best practices" description = "Git workflow automation to follow best practices"
version = "v1.0.0" dynamic = ["version"]
requires-python = ">= 3.12" requires-python = ">= 3.12"
dependencies = [ dependencies = [
"requests" "requests"
src/git_flow/main.py
+5 -5
View File
@@ -257,7 +257,7 @@ def merge_command():
print("Cambios a mergear:") print("Cambios a mergear:")
for commit in commits: for commit in commits:
if commit != Git.UPDATED_CHANGELOG_MSG: if commit != Git.BUMP_VERSION:
print("- " + commit) print("- " + commit)
merge_conflicts = Git("merge", target, ff=False, commit=False).exec() merge_conflicts = Git("merge", target, ff=False, commit=False).exec()
@@ -406,7 +406,7 @@ def tag_command():
if update_changelog(merged_branch, branch): if update_changelog(merged_branch, branch):
Git("add", Git.CHANGELOG_FILE).exec() Git("add", Git.CHANGELOG_FILE).exec()
Git("commit", message=Git.UPDATED_CHANGELOG_MSG).exec() Git("commit", message=Git.BUMP_VERSION).exec()
Git("push").exec() Git("push").exec()
else: else:
Git("tag", new_version, commit).exec() Git("tag", new_version, commit).exec()
@@ -523,7 +523,7 @@ def get_unique_branch_name(branch_type):
def update_changelog(branch: str, target: str): def update_changelog(branch: str, target: str):
last_commit = Git("show", "HEAD", no_patch=True, format="%s").firstline() 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 return False
else: else:
content = generate_changelog_entry(branch, target) 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() email = Git("show", commit, patch=False, format="%ae").firstline()
username = email[:email.index('@')] username = email[:email.index('@')]
if message == Git.UPDATED_CHANGELOG_MSG: if message == Git.BUMP_VERSION:
continue continue
index = message.index(":") index = message.index(":")
@@ -598,7 +598,7 @@ def generate_changelog_entry(branch: str, target: str):
def create_pull_request(service: str, repository: str, source: str, destination: str): def create_pull_request(service: str, repository: str, source: str, destination: str):
endpoint = get_api_endpoint(service, repository, "/pullrequests") endpoint = get_api_endpoint(service, repository, "/pullrequests")
title = source.replace("/", ": ").replace("-", " ") title = source.replace("/", ": ").replace("-", " ")
description = "\n".join(get_changelog_content_lines(destination)) description = "\n".join(get_changelog_content_lines(source, destination))
headers = get_headers() headers = get_headers()
json = { json = {