Add bump mechanism again

Author: virtuald

.github/workflows/bump.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+
+import argparse
+import pathlib
+import sys
+
+import tomlkit
+
+root = pathlib.Path(__file__).parent.parent.parent
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("package")
+    parser.add_argument("package_version")
+    parser.add_argument("repo_version")
+    args = parser.parse_args()
+
+    # Package version year must match repo version year, otherwise we can end
+    # up with users trying to install the prior year's packages and they
+    # install a mess instead
+    if args.repo_version.split(".")[0] != args.package_version.split(".")[0]:
+        print("!! Package version year does not match repo version year!")
+        return 1
+
+    with open(root / "pyproject.toml") as fp:
+        data = tomlkit.load(fp)
+
+    pkg = data["tool"]["meta"]["packages"][args.package]
+    if "version" in pkg:
+        pkg["version"] = f"=={args.package_version}"
+    elif "min_version" in pkg:
+        pkg["min_version"] = args.package_version
+    else:
+        raise ValueError("unknown format")
+
+    with open(root / "pyproject.toml", "w") as fp:
+        tomlkit.dump(data, fp)
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

.github/workflows/bump.yml

@@ -11,44 +11,36 @@ jobs:
     - name: Information
       run: |
         echo "Version update for ${{ github.event.client_payload.package_name }} -> ${{ github.event.client_payload.package_version }} requested"
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.REPO_ACCESS_TOKEN }}
         fetch-depth: 0
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: 3.8
 
-    # To prevent lots of spurious pypi package pushes during upgrades, you can
-    # commit a file 'pause_until'. This will only push a new tag once that
-    # package has been reached
-    # - name: Check if paused
-    #   id: check-paused
-    #   shell: bash
-    #   run: |
-    #     if [ ! -f pause_until ]; then
-    #       echo "::set-output name=paused::no"
-    #     elif [ "$(cat pause_until)" == "${{ github.event.client_payload.package_name }}" ]; then
-    #       rm pause_until
-    #       git config --local user.email "[email protected]"
-    #       git config --local user.name "Github Action"
-    #       git commit -m "Remove paused marker" pause_until
-    #       git push
-    #       echo "::set-output name=paused::no"
-    #     else
-    #       echo "::set-output name=paused::yes"
-    #     fi
+    - name: Install script requirements
+      shell: bash
+      run: |
+        python -m pip --disable-pip-version-check install packaging tomlkit
     
-    - name: Bump Requirements
-      uses: robotpy/build-actions/bump-requirements@v2022
-      with:
-        pkgname: ${{ github.event.client_payload.package_name }}
-        pkgver: ${{ github.event.client_payload.package_version }}
+    - name: Bump requirements
+      shell: bash
+      run: |
+        python .github/workflows/bump.py ${{ github.event.client_payload.package_name }} ${{ github.event.client_payload.package_version }} "$(git describe --tags)"
 
-    # - name: Bump Version and push Tag
-    #   uses: anothrNick/[email protected]
-    #   # if: steps.check-paused.paused == 'no'
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-    #     DEFAULT_BUMP: patch
-    #     WITH_V: false
+    - name: Commit and push
+      shell: bash
+      run: |
+        git config --local user.email "[email protected]"
+        git config --local user.name "Github Action"
+        git add pyproject.toml
+        git commit -m "Bump '${{ github.event.client_payload.package_name }}' dependency to '${{ github.event.client_payload.package_version }}'"
+        git push
+
+    - name: Tag and push
+      shell: bash
+      run: |
+        TAG=$(python .github/workflows/tag.py ${{ github.event.client_payload.package_name }} ${{ github.event.client_payload.package_version }} "$(git describe --tags --no-abbrev)")
+        git tag ${TAG}
+        git push origin ${TAG}

.github/workflows/dist.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: 3.8

.github/workflows/tag.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+import sys
+import typing
+
+from packaging.version import Version
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("package")
+    parser.add_argument("package_version")
+    parser.add_argument("repo_version")
+    args = parser.parse_args()
+
+    package_version = Version(args.package_version)
+    repo_version = Version(args.repo_version)
+
+    if args.package == "mostrobotpy" and (
+        repo_version.major != package_version.major
+        or repo_version.minor != package_version.minor
+        or repo_version.micro != package_version.micro
+        or repo_version.pre != package_version.pre
+    ):
+        new_version = package_version
+    else:
+        # Only bump the super micro version unless its a beta
+        if repo_version.pre:
+            v = ".".join(map(str, repo_version.release))
+            v = f"{v}{''.join(map(str, repo_version.pre))}"
+            if repo_version.post:
+                v = f"{v}.post{repo_version.post+1}"
+            else:
+                v = f"{v}.post1"
+            new_version = Version(v)
+        else:
+            parts: list = list(repo_version.release)
+            if len(parts) == 3:
+                parts.append(1)
+            else:
+                parts[3] = int(parts[3]) + 1
+            new_version = Version(".".join(map(str, parts)))
+
+    assert new_version > repo_version
+    print(new_version)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())