Merge pull request #8 from akshatnerella/akshatnerella/ci-pipeline-updates

bump version logic changes

Author: akshatnerella

.github/scripts/pr_bump_version.py

@@ -24,16 +24,8 @@ def parse_setup_version(text: str) -> str:
     return match.group(1)
 
 
-def latest_tag_version() -> str | None:
-    tags = run("git", "tag", "--list", "v*", "--sort=-v:refname").splitlines()
-    for tag in tags:
-        if re.fullmatch(r"v\d+\.\d+\.\d+", tag):
-            return tag[1:]
-    return None
-
-
-def base_branch_version(base_ref: str) -> str:
-    setup_on_base = run("git", "show", f"origin/{base_ref}:setup.py")
+def base_branch_version(base_remote: str, base_ref: str) -> str:
+    setup_on_base = run("git", "show", f"{base_remote}/{base_ref}:setup.py")
     return parse_setup_version(setup_on_base)
 
 
@@ -67,11 +59,12 @@ def main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("--bump", choices=["major", "minor", "patch"], required=True)
     parser.add_argument("--base-ref", required=True)
+    parser.add_argument("--base-remote", default="origin")
     args = parser.parse_args()
 
     setup_text = Path("setup.py").read_text(encoding="utf-8")
     current_version = parse_setup_version(setup_text)
-    base_version = latest_tag_version() or base_branch_version(args.base_ref)
+    base_version = base_branch_version(args.base_remote, args.base_ref)
     target_version = bump_version(base_version, args.bump)
 
     changed = update_setup(target_version)

.github/workflows/pr-version-bump.yml

@@ -68,17 +68,17 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
 
-      - name: Fetch base branch and tags
+      - name: Fetch base branch
         run: |
           git fetch origin "${{ github.event.pull_request.base.ref }}"
-          git fetch --tags
 
       - name: Bump setup.py version
         id: bump
         run: |
           python .github/scripts/pr_bump_version.py \
             --bump "${{ steps.label.outputs.bump }}" \
-            --base-ref "${{ github.event.pull_request.base.ref }}"
+            --base-ref "${{ github.event.pull_request.base.ref }}" \
+            --base-remote "origin"
 
       - name: Commit and push version update
         if: steps.bump.outputs.changed == 'true'

README.md

@@ -117,6 +117,7 @@ One-time setup required:
    - `release:minor`
    - `release:patch`
 4. If no release label is present, the workflow automatically adds `release:patch` and bumps patch version.
+5. Automatic version bump commits run for same-repository PR branches; fork PRs require a maintainer to apply/version-bump after merge.
 
 If the version already exists on PyPI, publish is skipped safely.
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='pyladdersim',
-    version='0.1.1',
+    version='0.1.2',
     packages=find_packages(exclude=["tests", "tests.*"]),
     install_requires=[
         'matplotlib',