From 34cdfc81bd2614625e5903aba9cf79fcf692aab6 Mon Sep 17 00:00:00 2001 From: MilagrosMarin Date: Fri, 17 Jul 2026 06:27:36 +0200 Subject: [PATCH 1/3] chore(release-flow): fix stale doc pointers and remove dead badge step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three findings from #1503: - src/datajoint/version.py: header comment listed label_prs.yaml / release.yaml / post_release.yaml — none exist; actual workflows are draft_release.yaml and post_draft_release_published.yaml. - RELEASE_MEMO.md: Branch Structure table listed master as 2.1.x; bumped to 2.3.x to match current line. - .github/workflows/post_draft_release_published.yaml: removed the 'Update README.md badge' step. The seds targeted / elements that were removed from README in ff04914c (2026-01-04); the step ran empty every release, guarded by the follow-up git-diff-empty-commit check. Leaves finding 1 from #1503 (version.py timing at tag) open — that one is an architectural choice for the maintainer. --- .github/workflows/post_draft_release_published.yaml | 12 ------------ RELEASE_MEMO.md | 2 +- src/datajoint/version.py | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/post_draft_release_published.yaml b/.github/workflows/post_draft_release_published.yaml index f9b80dfdb..3cecc7e59 100644 --- a/.github/workflows/post_draft_release_published.yaml +++ b/.github/workflows/post_draft_release_published.yaml @@ -47,18 +47,6 @@ jobs: git add src/datajoint/version.py git commit -m "Update version.py to $VERSION" echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV - - name: Update README.md badge - run: | - # commits since the last release - NEW_HREF="https://github.com/datajoint/datajoint-python/compare/${{ github.event.release.tag_name }}...master" - NEW_SRC="https://img.shields.io/github/commits-since/datajoint/datajoint-python/${{ github.event.release.tag_name }}?color=red" - # Update href in the tag - sed -i 's|\(]*href="\)[^"]*\(".*\)|\1'"$NEW_HREF"'\2|' README.md - # Update src in the tag - sed -i 's|\(]*src="\)[^"]*\(".*\)|\1'"$NEW_SRC"'\2|' README.md - git add README.md - # Only commit if there are changes (handles re-runs gracefully) - git diff --cached --quiet README.md || git commit -m "Update README.md badge to ${{ github.event.release.tag_name }}" - name: Set up Python ${{matrix.py_ver}} uses: actions/setup-python@v5 with: diff --git a/RELEASE_MEMO.md b/RELEASE_MEMO.md index 73700b602..14eb4bc6d 100644 --- a/RELEASE_MEMO.md +++ b/RELEASE_MEMO.md @@ -4,7 +4,7 @@ | Branch | Purpose | Version | |--------|---------|---------| -| `master` | Main development | 2.1.x | +| `master` | Main development | 2.3.x | | `maint/2.0` | Maintenance releases | 2.0.x | For 2.0.x bugfixes: diff --git a/src/datajoint/version.py b/src/datajoint/version.py index 15acad8aa..b7d6af275 100644 --- a/src/datajoint/version.py +++ b/src/datajoint/version.py @@ -1,4 +1,4 @@ # version bump auto managed by Github Actions: -# label_prs.yaml(prep), release.yaml(bump), post_release.yaml(edit) +# draft_release.yaml (draft), post_draft_release_published.yaml (bump + PR) # manually set this version will be eventually overwritten by the above actions __version__ = "2.3.1" From eaa1f1866095937b16f4cd107a04efa26cbcedac Mon Sep 17 00:00:00 2001 From: MilagrosMarin Date: Fri, 17 Jul 2026 17:37:26 +0200 Subject: [PATCH 2/3] docs(release-memo): drop maint/2.0 references; fix label-table categories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per Dimitri's review on #1504: - Removed the maint/2.0 row from Branch Structure and the entire 'For 2.0.x bugfixes:' block (no longer supporting 2.0.x; leaving the actual git branch alone). - Updated the PR-labels table categories to match release_drafter.yaml verbatim. The 'documentation' row was misleading ('usually excluded' when release_drafter has a '📝 Documentation' category). Also updated the other three rows for internal consistency and added the missing 'feature' -> '🚀 Features' row. --- RELEASE_MEMO.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/RELEASE_MEMO.md b/RELEASE_MEMO.md index 14eb4bc6d..97a3c044d 100644 --- a/RELEASE_MEMO.md +++ b/RELEASE_MEMO.md @@ -5,12 +5,6 @@ | Branch | Purpose | Version | |--------|---------|---------| | `master` | Main development | 2.3.x | -| `maint/2.0` | Maintenance releases | 2.0.x | - -For 2.0.x bugfixes: -1. Commit to `maint/2.0` -2. Tag and release as v2.0.x -3. Cherry-pick to master if applicable --- @@ -68,10 +62,11 @@ The release drafter uses PR labels to categorize changes: | Label | Category | |-------|----------| -| `breaking` | BREAKING CHANGES | -| `enhancement` | Added | -| `bug` | Fixed | -| `documentation` | (usually excluded) | +| `breaking` | 💥 Breaking Changes | +| `feature` | 🚀 Features | +| `enhancement` | ⚡️ Enhancements | +| `bug` | 🐛 Bug Fixes | +| `documentation` | 📝 Documentation | Ensure PRs have appropriate labels before merging. From feea261077a9c1d85791bc78fc999fd18fe9c563 Mon Sep 17 00:00:00 2001 From: MilagrosMarin Date: Fri, 17 Jul 2026 17:41:37 +0200 Subject: [PATCH 3/3] docs(release-memo): add MilagrosMarin to maintainer list --- RELEASE_MEMO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_MEMO.md b/RELEASE_MEMO.md index 97a3c044d..7fb46cf30 100644 --- a/RELEASE_MEMO.md +++ b/RELEASE_MEMO.md @@ -210,6 +210,7 @@ After build completes: - @datajointbot - @dimitri-yatsenko +- @MilagrosMarin - @ttngu207 ## Links