Skip to content

build: release 2026.6.9 (+ fix CITATION pre-commit hook portability)#74

Merged
nextgenusfs merged 2 commits into
mainfrom
bump-version-2026.6.9
Jun 10, 2026
Merged

build: release 2026.6.9 (+ fix CITATION pre-commit hook portability)#74
nextgenusfs merged 2 commits into
mainfrom
bump-version-2026.6.9

Conversation

@nextgenusfs

Copy link
Copy Markdown
Owner

Summary

Release cut for 2026.6.9 (today). Two commits:

  1. fix(hooks): make pre-commit CITATION sync portable — The
    .githooks/pre-commit hook auto-updates CITATION.cff whenever
    pyproject.toml changes, but two bugs caused it to silently corrupt
    the file on macOS/BSD:

    • The version-extraction regex used \s (GNU-only) in grep -E /
      sed -E. On BSD this matches a literal s, so the capture fails
      and VERSION falls back to the entire matched line
      (version = "X.Y.Z").
    • The CITATION substitution s/version: .*/.../ was unanchored,
      so it also rewrote the cff-version: line.

    Together these produced the malformed CFF that fix: repair CITATION.cff and clarify BAM contig-map comment #73 had to repair.
    Fix is [[:space:]] instead of \s and ^-anchored substitutions.

  2. build: bump version to 2026.6.9pyproject.toml and
    CITATION.cff bumped from 26.5.22 to 2026.6.9, matching the
    CalVer (YYYY.M.D) form of the prior v2025.11.1 tag.

Test plan

  • cffconvert --validate -i CITATION.cff → valid against schema 1.2.0.
  • Ran the fixed hook locally against the new pyproject.toml; it
    extracted 2026.6.9 correctly and updated only the version: and
    date-released: lines (cff-version line untouched).

Follow-up

Once merged, I'll tag v2026.6.9 on main to trigger
production-release.yml and docker.yml.

Jon Palmer added 2 commits June 9, 2026 17:26
The pre-commit hook auto-updates CITATION.cff whenever pyproject.toml
changes, but two bugs caused it to silently corrupt the file on
macOS/BSD:

1. The version-extraction regex used \s (GNU-only) in grep -E / sed -E.
   On BSD this matches a literal 's', so the capture fails and VERSION
   falls back to the entire matched line ('version = "X.Y.Z"').
2. The CITATION.cff substitution `s/version: .*/.../` was unanchored,
   so it also rewrote the `cff-version:` line.

Together these turned `cff-version: 1.2.0` and `version: X.Y.Z` into
`cff-version: version = "X.Y.Z"` and `version: version = "X.Y.Z"`,
which is invalid CFF (this is what PR #73 had to repair).

Fix both by using POSIX [[:space:]] and anchoring the substitutions
with ^.
Release cut after #73. Switches to CalVer (YYYY.M.D) matching the
prior v2025.11.1 tag rather than the intermediate YY.M.DD form used
in 26.5.22.

- pyproject.toml: 26.5.22 -> 2026.6.9
- CITATION.cff: version + date-released for today's tag
@nextgenusfs nextgenusfs merged commit a52473d into main Jun 10, 2026
5 checks passed
nextgenusfs pushed a commit that referenced this pull request Jun 10, 2026
Mis-typed the version in #74 as 2026.6.9 (full-year CalVer) instead
of 26.6.9 (YY.M.D), which is the form actually used by this project
(prior on-PyPI release was 26.5.22). The wrong tag v2026.6.9 is being
removed; replacing it with v26.6.9.

TestPyPI already received funannotate2-2026.6.9 from the bad tag;
that artifact is left in place on TestPyPI (irreversible there) and
will simply be ignored. PyPI was not affected (production release is
workflow_dispatch only).
nextgenusfs pushed a commit that referenced this pull request Jun 10, 2026
The version bump in #74 missed updating pixi.lock, which kept
funannotate2 pinned at 26.5.22. That broke `pixi install --locked`
in the Docker build (docker.yml is the only workflow that consumes
the lockfile).

Regenerated with `pixi install` (default env). Only the funannotate2
package version line changed; transitive deps are untouched.

The v26.6.9 tag is being force-moved to this commit so the Docker
push-on-tag trigger picks up the fixed lockfile.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant