From baef51fa64986b95e1e5fafcf698b234e0899d5c Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 6 Aug 2026 13:39:26 +0000 Subject: [PATCH 1/2] chore: open the 2.0.0-beta line on develop 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 Claude-Session: https://claude.ai/code/session_01TqhZUMguWUR63DcCdUBP9W --- README.md | 16 ++++++++++++++++ buzz/__init__.py | 2 +- package.json | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f5b28cbd..9328489d 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,22 @@ Pre-commit is configured to use the following tools for checking and formatting - eslint - prettier - pyupgrade + +#### Branches + +Buzz is developed on two release lines: + +| Branch | Line | What it is | +| --- | --- | --- | +| `main` | 1.x — stable | The supported release line, and what `bench get-app` installs by default. | +| `develop` | 2.x — beta | Where the next major lands, including team-based multi-tenancy. Not yet released. | + +Open your pull request against `develop`. Once it is merged, add a `backport main` +label to cherry-pick it onto the stable line — the [backport +workflow](.github/workflows/backport.yml) opens the follow-up PR for you. Changes +that target 2.x only, such as anything building on teams, stay on `develop` and +should not be labelled. + ### CI This app can use GitHub Actions for CI. The following workflows are configured: diff --git a/buzz/__init__.py b/buzz/__init__.py index 8f6a68c5..9b5aa381 100644 --- a/buzz/__init__.py +++ b/buzz/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.0.0" +__version__ = "2.0.0b0" import os diff --git a/package.json b/package.json index d08074f1..178bd066 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "buzz-frappe-app", - "version": "1.0.0", + "version": "2.0.0-beta.0", "description": "Event Management App built on Frappe", "main": "index.js", "scripts": { From a3ef76bf4c862f5a3dae3e036de03d84a8a785f5 Mon Sep 17 00:00:00 2001 From: Harsh Tandiya Date: Mon, 10 Aug 2026 15:55:55 +0530 Subject: [PATCH 2/2] chore: use the semver pre-release form for __version__ 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 --- buzz/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buzz/__init__.py b/buzz/__init__.py index 9b5aa381..179fca63 100644 --- a/buzz/__init__.py +++ b/buzz/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.0.0b0" +__version__ = "2.0.0-beta.0" import os