templatepy 0.16.2__tar.gz → 0.16.3__tar.gz

{templatepy-0.16.2 → templatepy-0.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: templatepy
-Version: 0.16.2
+Version: 0.16.3
 Summary: Copier template for modern Python packages
 Project-URL: Homepage, https://github.com/larsrollik/templatepy
 Project-URL: Documentation, https://larsrollik.github.io/templatepy

templatepy-0.16.3/VERSION

@@ -0,0 +1 @@
+0.16.3

{templatepy-0.16.2 → templatepy-0.16.3}/pyproject.toml

@@ -51,7 +51,7 @@ include = ["src", "copier.yaml", "template", "CITATION.cff", "README.md", "VERSI
 
 [tool.commitizen]
 version_provider = "commitizen"
-version = "0.16.2"
+version = "0.16.3"
 version_files = ["VERSION"]
 tag_format = "v$version"
 update_changelog_on_bump = false

{templatepy-0.16.2 → templatepy-0.16.3}/template/[% if ci_platform in ['forgejo','both'] %].forgejo[% endif %]/workflows/release.yml

@@ -36,6 +36,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.VERSION_PUSH_TOKEN || github.token }}
 
       - name: Configure git identity
         run: |
@@ -48,17 +49,54 @@ jobs:
 
       - name: Bump version
         id: bump
+        env:
+          FJ_TOKEN: ${{ secrets.VERSION_PUSH_TOKEN || github.token }}
         run: |
-          uvx --from commitizen cz bump --yes || EXIT=$?
+          uvx --from commitizen cz bump --files-only --yes || EXIT=$?
           if [ "${EXIT:-0}" -eq 21 ] || [ "${EXIT:-0}" -eq 6 ]; then
             echo "No bumpable commits since last tag — skipping."
             echo "skipped=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
           [ "${EXIT:-0}" -eq 0 ] || exit $EXIT
-          VERSION=$(cat VERSION)
-          git push origin HEAD:main
-          git push origin "v${VERSION}"
+          VERSION="$(cat VERSION)"
+          TAG="v${VERSION}"
+          # Forgejo 15.0.9: a git push from Actions to a PROTECTED main is attributed to
+          # the internal Actions user (uid -2), which the pre-receive hook cannot resolve,
+          # so it is refused before the push whitelist is consulted. Commit via the
+          # contents API instead - it creates the commit server-side and resolves the
+          # author from the token, so a whitelisted write token lands the bump. Set
+          # VERSION_PUSH_TOKEN (a repo:write token on main's push whitelist) when main is
+          # protected; otherwise the automatic token works. Tag the RETURNED commit sha.
+          CHANGED="$(git diff --name-only)"
+          [ -n "$CHANGED" ] || { echo "cz bump changed no files"; exit 1; }
+          python3 - "$TAG" $CHANGED <<'PY'
+          import base64, json, os, sys, urllib.request
+
+          tag, paths = sys.argv[1], sys.argv[2:]
+          api = f"{os.environ['GITHUB_SERVER_URL']}/api/v1/repos/{os.environ['GITHUB_REPOSITORY']}"
+          tok = os.environ["FJ_TOKEN"]
+
+          def req(method, path, body=None):
+              data = json.dumps(body).encode() if body is not None else None
+              r = urllib.request.Request(
+                  api + path, data=data, method=method,
+                  headers={"Authorization": f"token {tok}", "Content-Type": "application/json"},
+              )
+              with urllib.request.urlopen(r) as resp:
+                  raw = resp.read()
+              return json.loads(raw) if raw else None
+
+          files = []
+          for p in paths:
+              info = req("GET", f"/contents/{p}?ref=main")
+              content = base64.b64encode(open(p, "rb").read()).decode()
+              files.append({"operation": "update", "path": p, "content": content, "sha": info["sha"]})
+          resp = req("POST", "/contents", {"branch": "main", "message": f"bump: {tag}", "files": files})
+          sha = resp["commit"]["sha"]
+          req("POST", "/tags", {"tag_name": tag, "target": sha})
+          print(f"committed {sha} and tagged {tag}")
+          PY
           echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
 
       - name: Build

templatepy-0.16.2/VERSION

@@ -1 +0,0 @@
-0.16.2