bugfix: arreglo acceso a secretos

Reviewed-on: #2

.flowconfig

@@ -2,3 +2,5 @@
 	remote = origin
 	branches = main
 	initialized = true
+	version = 2
+	remote-type = gitea

.gitea/workflows/publish-pypi.yaml

@@ -0,0 +1,35 @@
+name: Publish to PyPI
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  Publish-to-PyPI:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+
+      - name: Show git log
+        run: |
+          git log --oneline --graph -10
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: ".python-version"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.3.2
+
+      - name: Bump version
+        run: |
+          uv run git-flow tag --token="${{ secrets.GITEA_TOKEN}}"
+
+      - name: Build and publish
+        run: |
+          uv build
+          uv publish --token="${{ secrets.PYPI_TOKEN }}"

CHANGELOG.md

@@ -1,3 +1,24 @@
+## v1.17.5 - 2026-06-03
+
+- **bugfix**:  allow commits not compliant with conventional commits in changelog generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (3ff9f76)
+
+---
+
+
+## v1.17.4 - 2026-05-24
+
+- **bugfix**:  use rest of branch name instead of ticket for pr title generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (094bc1a)
+
+---
+
+
+## v1.17.3 - 2026-05-22
+
+- **bugfix**:  dont close branches on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (8ee0129)
+
+---
+
+
 ## v1.17.2 - 2026-05-22
 
 - **bugfix**:  change pr title on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (de124ba)

README.md

@@ -47,7 +47,8 @@ El comando solicitará 2 opciones:
   automáticamente. Por el momento, se soportan los siguientes remotos:
 
     - [x] Bitbucket
-    - [ ] Github: planeado
+    - [x] Github
+    - [x] Gitea
 
   La configuración del remoto requiere tener un Access Token para poder crear los PRs automáticamente.
   El mismo se puede crear desde el repositorio al que se quiere dar acceso: *"Repository settings" >

src/git_flow/__init__.py

@@ -51,3 +51,5 @@ SUPPORTED_REMOTE_APIS = [
 REPOSITORY_TOKEN_FILENAME = ".repository-token"
 
 FLOWCONFIG_FILENAME = ".flowconfig"
+
+FLOWCONFIG_VERSION = 2

src/git_flow/changelog.py

@@ -28,11 +28,15 @@ class Changelog:
             message = Git("show", commit, patch=False, format="%s").firstline()
             email = Git("show", commit, patch=False, format="%ae").firstline()
             username = email[: email.index("@")]
-            index = message.index(":")
-            commit_type = message[:index]
-            commit_message = message[index + 1 :]
+            description = message
 
-            content += f"- **{commit_type}**: {commit_message} [[{username}](mailto:{email})] ({commit})\n"
+            if ":" in message:
+                index = message.index(":")
+                commit_type = message[:index]
+                commit_message = message[index + 1 :]
+                description = f"**{commit_type}**: {commit_message}"
+
+            content += f"- {description} [[{username}](mailto:{email})] ({commit})\n"
 
         return content
 

src/git_flow/command/base.py

@@ -2,12 +2,14 @@ from git_flow import (
     BRANCH_TYPES,
     REPOSITORY_TOKEN_FILENAME,
     FLOWCONFIG_FILENAME,
+    FLOWCONFIG_VERSION,
     GitFlowError,
 )
 from git_flow.git import Git
 from git_flow.remote.base import RemoteAPI
 from git_flow.remote.bitbucket import BitbucketRemoteAPI
 from git_flow.remote.github import GithubRemoteAPI
+from git_flow.remote.gitea import GiteaRemoteAPI
 from git_flow.io import *
 from os.path import isfile
 
@@ -32,6 +34,14 @@ def ensure_initialized():
             f"El valor de `flow.initialized` ({initialized}) es inválido."
         )
 
+    version = int(flowconfig.get("flow.version", "1"))
+
+    if version != FLOWCONFIG_VERSION:
+        raise GitFlowError(
+            f"La versión del flowconfig ({version}) no es compatible con esta versión de git-flow ({FLOWCONFIG_VERSION}). "
+            f"Debe reinicializar el repositorio."
+        )
+
 
 def ensure_right_branch():
     branch = Git.get_current_branch()
@@ -104,14 +114,18 @@ def get_remote_api(token: str) -> RemoteAPI:
     if "flow.remote" not in flowconfig:
         raise GitFlowError("El repositorio no tiene configurado un remoto.")
 
+    remote_type = flowconfig.get("flow.remote-type", "").lower()
     [host, repository] = RemoteAPI.parse(flowconfig["flow.remote"])
 
-    if host == "bitbucket.org":
+    if remote_type == "gitea":
+        return GiteaRemoteAPI("https://" + host, repository, token)
+    elif remote_type == "bitbucket":
         return BitbucketRemoteAPI(repository, token)
-    elif host == "github.com":
+    elif remote_type == "github":
         return GithubRemoteAPI(repository, token)
     else:
-        raise GitFlowError("El host del repositorio remoto es inválido")
+        raise GitFlowError("El tipo del remoto es inválido")
+
 
 def is_valid_ticket(ticket: str) -> bool:
     """Check if the specified string is a valid ticket number (ABC-123)"""

src/git_flow/command/init.py

@@ -1,6 +1,6 @@
 import typer
 
-from git_flow import FLOWCONFIG_FILENAME, GitFlowError
+from git_flow import FLOWCONFIG_FILENAME, FLOWCONFIG_VERSION, GitFlowError
 from git_flow.git import Git
 from git_flow.command.base import *
 
@@ -15,15 +15,17 @@ def init():
     _ensure_not_already_initialized()
 
     branches = _setup_flow_branches()
-    remote = _setup_flow_remote()
+    (remote, remote_type) = _setup_flow_remote()
 
     flowconfig = {
+        "flow.version": str(FLOWCONFIG_VERSION),
         "flow.initialized": "true",
         "flow.branches": ",".join(branches),
     }
 
-    if remote:
+    if remote and remote_type:
         flowconfig["flow.remote"] = remote
+        flowconfig["flow.remote-type"] = remote_type
 
     Git.set_config(flowconfig, FLOWCONFIG_FILENAME)
     Git("add", FLOWCONFIG_FILENAME).exec()
@@ -74,6 +76,7 @@ def _setup_flow_remote():
     )
 
     remote = None
+    remote_type = None
 
     if confirm("¿Configurar repositorio remoto?"):
         remotes = Git("remote").lines(print="Listando remotos disponibles")
@@ -93,7 +96,9 @@ def _setup_flow_remote():
             info("Tiene más de un remoto, seleccione el que va a utilizar.")
             remote = choice("Remoto", remotes)
 
-    return remote
+        remote_type = choice("Tipo de remoto:", ["bitbucket", "github", "gitea"])
+
+    return (remote, remote_type)
 
 
 def _ensure_all_flow_branches_exist(branches: list[str], remote: str | None):

src/git_flow/command/merge.py

@@ -111,6 +111,7 @@ def create_pull_request(token: str, branch: str, target: str):
         target,
         title,
         changelog.generate_content(target, branch),
+        branch not in environments
     )
 
     success(message)
@@ -137,7 +138,7 @@ def _get_pr_title_from_branch(branch: str) -> str:
         maybe_ticket = branch_desc[:second_dash]
         if is_valid_ticket(maybe_ticket):
             branch_ticket = maybe_ticket
-            branch_desc = branch_desc[:second_dash+1]
+            branch_desc = branch_desc[second_dash+1:]
 
     return " ".join(filter(None, [
         f"[Pasaje a {components[1]}]" if len(components) == 4 else None,

src/git_flow/remote/base.py

@@ -12,43 +12,23 @@ class RemoteAPI(ABC):
     @staticmethod
     def parse(remote: str):
         url = Git("remote", "get-url", remote).firstline()
-        invalid_url_error = GitFlowError(f"La URL del remoto {remote} es inválida: {url}")
-        url_type = None
 
         if url.startswith("git@"):
-            url_type = "ssh"
-        elif url.startswith("http://") or url.startswith("https://"):
-            url_type = "https"
-        else:
-            raise invalid_url_error
-
-        if url_type == "ssh":
-            # git@host:user/repo[.git]
             at_pos = url.index("@")
             colon_pos = url.index(":")
             host = url[at_pos+1:colon_pos]
             repository = url[colon_pos+1:]
-        else:
-            # https://host/user/repo[.git]
+        elif url.startswith("http://") or url.startswith("https://"):
             host_start = url.index("://") + 3
             uri_start = url.index("/", host_start)
             host = url[host_start:uri_start]
             repository = url[uri_start+1:]
+        else:
+            raise GitFlowError(f"La URL del remoto {remote} es inválida: {url}")
 
-        # Esto permite configurar hosts "imaginarios" para permitir el uso de multiples claves ssh
-        if host.endswith(".bitbucket.org"):
-            host = "bitbucket.org"
-        elif host.endswith(".github.com"):
-            host = "github.com"
-
-        if host not in SUPPORTED_REMOTE_APIS:
-            raise GitFlowError("El host del repositorio remoto es inválido")
-
-        repository.removesuffix(".git")
-
+        repository = repository.removesuffix(".git")
         return [host, repository]
 
-
     @abstractmethod
     def create_pull_request(
         self,
@@ -56,6 +36,7 @@ class RemoteAPI(ABC):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ) -> str:
         pass
 

src/git_flow/remote/bitbucket.py

@@ -12,6 +12,7 @@ class BitbucketRemoteAPI(RemoteAPI):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ):
         request = requests.post(
             self.get_endpoint("/pullrequests"),
@@ -21,7 +22,7 @@ class BitbucketRemoteAPI(RemoteAPI):
                 "description": description,
                 "source": {"branch": {"name": source}},
                 "destination": {"branch": {"name": destination}},
-                "close_source_branch": True,
+                "close_source_branch": close_source_branch,
             },
         )
 

src/git_flow/remote/gitea.py

@@ -0,0 +1,55 @@
+import requests
+from git_flow import GitFlowError
+from git_flow.remote.base import RemoteAPI
+
+
+class GiteaRemoteAPI(RemoteAPI):
+    def __init__(self, base_url: str, repository: str, token: str) -> None:
+        super().__init__(repository, token)
+        self.base_url = base_url
+
+    def create_pull_request(
+        self,
+        source: str,
+        destination: str,
+        title: str | None = None,
+        description: str | None = None,
+        close_source_branch: bool = True
+    ) -> str:
+        response = requests.post(
+            self.get_endpoint("/pulls"),
+            headers=self.get_headers(),
+            json={
+                "title": title,
+                "body": description,
+                "head": source,
+                "base": destination,
+            },
+        )
+
+        if response.ok:
+            return "PR creado exitosamente: " + response.json()["html_url"]
+        else:
+            raise GitFlowError("Ocurrió un error al crear el PR: " + response.text)
+
+    def create_tag(self, tag: str, commit: str) -> str:
+        response = requests.post(
+            self.get_endpoint("/tags"),
+            headers=self.get_headers(),
+            json={"tag_name": tag, "target": commit},
+        )
+
+        if response.ok:
+            return "Tag creado exitosamente: " + tag
+        else:
+            raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
+
+    def get_endpoint(self, resource: str) -> str:
+        return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
+    
+    def get_headers(self):
+        return {
+            "Accept": "application/json",
+            "Content-Type": "application/json",
+            "Authorization": "token " + self.token,
+        }

src/git_flow/remote/github.py

@@ -1,9 +1,10 @@
+import requests
 from git_flow import GitFlowError
 from git_flow.remote.base import RemoteAPI
 
 
 class GithubRemoteAPI(RemoteAPI):
-    API_ENDPOINT = "https://github.com"
+    API_ENDPOINT = "https://api.github.com/repos"
 
     def create_pull_request(
         self,
@@ -11,11 +12,35 @@ class GithubRemoteAPI(RemoteAPI):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ) -> str:
-        raise GitFlowError("not implemented yet!")
+        response = requests.post(
+            self.get_endpoint("/pulls"),
+            headers=self.get_headers(),
+            json={
+                "title": title,
+                "body": description,
+                "head": source,
+                "base": destination,
+            },
+        )
+
+        if response.ok:
+            return "PR creado exitosamente: " + response.json()["html_url"]
+        else:
+            raise GitFlowError("Ocurrió un error al crear el PR: " + response.text)
 
     def create_tag(self, tag: str, commit: str) -> str:
-        raise GitFlowError("not implemented yet!")
+        response = requests.post(
+            self.get_endpoint("/git/refs"),
+            headers=self.get_headers(),
+            json={"ref": f"refs/tags/{tag}", "sha": commit},
+        )
+
+        if response.ok:
+            return "Tag creado exitosamente: " + tag
+        else:
+            raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
 
     def get_endpoint(self, resource: str) -> str:
-        return GithubRemoteAPI.API_ENDPOINT
+        return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"