Skip to content

chore: open the 2.0.0-beta line on develop - #321

Merged
harshtandiya merged 2 commits into
developfrom
claude/develop-2-0-0-beta-bump
Aug 10, 2026
Merged

chore: open the 2.0.0-beta line on develop#321
harshtandiya merged 2 commits into
developfrom
claude/develop-2-0-0-beta-bump

Conversation

@harshtandiya

@harshtandiyaharshtandiya commented Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Companion to #320. That PR cuts 1.1.0 on main; this one opens the 2.x beta line here so develop doesn't inherit a 1.x version.

Split of the two lines: main = 1.x stable, develop = 2.x beta.

Changes

  • buzz/__init__.py: __version__2.0.0b0
  • package.json: version2.0.0-beta.0
  • README.md: a short Branches subsection under Contributing

Why the two version strings differ

They're the same version in each ecosystem's canonical pre-release form:

  • 2.0.0b0 is the PEP 440 normalised form. flit reads __version__ as the package version (dynamic = ["version"] in pyproject.toml), and writing 2.0.0-beta.0 there would rely on flit normalising it — some flit versions error on a non-normalised version instead. 2.0.0b0 avoids the question.
  • 2.0.0-beta.0 is the semver form npm expects; 2.0.0b0 is not valid semver.

Worth a sanity check on your side: I couldn't run flit here (flit_core isn't installed in this environment), so the PEP 440 reasoning is from packaging, which normalises 2.0.0-beta.02.0.0b0. A bench build / editable install on a real bench would confirm it.

README

The new subsection sits directly above the CI section and states which branch to target, that a merged PR gets a backport main label to reach the stable line, and that 2.x-only work stays here unlabelled. It goes next to the existing contributing instructions because that's where someone deciding their base branch is already looking.

Note the install instructions further up already say bench get-app --branch main, which stays correct under this split.

Sequencing

Independent of #320 — no shared files land on both branches, so either can merge first. And like #320, this one must not get a backport main label.

main now carries the 1.x stable line and develop carries 2.x beta, so
develop should not inherit main's 1.1.0 version. Bump it to the first
2.0.0 pre-release instead.
Uses each ecosystem's canonical pre-release form: 2.0.0b0 (PEP 440) in
buzz/__init__.py, since flit reads it as the package version, and
2.0.0-beta.0 (semver) in package.json.
Documents the two release lines in the README's contributing section,
next to the backport-label instructions, so contributors know which
branch to target.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TqhZUMguWUR63DcCdUBP9W
@harshtandiya
harshtandiyaforce-pushed the claude/develop-2-0-0-beta-bump branch from 8de3514 to baef51fCompareAugust 7, 2026 12:45
Frappe parses each app's __version__ with semantic_version.Version in
its daily update check (frappe/utils/change_log.py), and that parser
rejects the PEP 440 form "2.0.0b0". Use "2.0.0-beta.0" instead: it is
valid semver and pip normalises it back to 2.0.0b0, so packaging is
unaffected and package.json now matches.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@harshtandiya
harshtandiya marked this pull request as ready for review August 10, 2026 10:26
@harshtandiya
harshtandiya merged commit e9f1042 into developAug 10, 2026
8 checks passed
@harshtandiya
harshtandiya deleted the claude/develop-2-0-0-beta-bump branch August 10, 2026 10:27
@greptile-apps

Copy link
Copy Markdown
Contributor

Greptile Summary

The PR opens the 2.x beta development line and documents how changes flow between development and stable branches.

  • Updates the Python and npm package versions to 2.0.0-beta.0.
  • Documents main as the stable 1.x line and develop as the 2.x beta line.
  • Explains how and when to request a backport to main.

Confidence Score: 5/5

The PR appears safe to merge with no actionable defects identified.

The Python and npm version metadata use a compatible prerelease value, and the new contributor instructions match the implemented post-merge backport workflow.

Important Files Changed

FilenameOverview
buzz/init.pyUpdates the application version to the 2.0.0 beta prerelease form accepted by the relevant Python packaging and Frappe version consumers.
package.jsonUpdates npm package metadata to the corresponding canonical semantic-version prerelease.
README.mdAdds branch-targeting and backport instructions consistent with the repository's backport workflow.

Reviews (1): Last reviewed commit: "chore: use the semver pre-release form f..." | Re-trigger Greptile

Sign up for freeto 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.

2 participants

@harshtandiya@claude