From 76ce3d4a77d5378f880df0937ee091b616932779 Mon Sep 17 00:00:00 2001
From: bsteubing <steubing.bernhard@gmail.com>
Date: Sun, 22 Mar 2026 15:46:17 -0500
Subject: [PATCH 1/2] ci: derive beta package version from UTC date-time (PEP
 440)

Replace commit-count suffix after 199b6c3 with YYYYMMDDHHMM UTC so
PyPI/conda beta builds are time-stamped and sortable.
---
 .github/ISSUE_TEMPLATE/beta_report.yml      | 2 +-
 .github/workflows/python-package-deploy.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/beta_report.yml b/.github/ISSUE_TEMPLATE/beta_report.yml
index 08340e01a..f1df6d14f 100644
--- a/.github/ISSUE_TEMPLATE/beta_report.yml
+++ b/.github/ISSUE_TEMPLATE/beta_report.yml
@@ -26,7 +26,7 @@ body:
     attributes:
       label: Version
       description: Please specify the version of the Activity Browser you are using.
-      placeholder: e.g. 3.0.0b940
+      placeholder: e.g. 3.0.0b202503221430 (from About / pip show)
   - type: dropdown
     id: distribution
     attributes:
diff --git a/.github/workflows/python-package-deploy.yml b/.github/workflows/python-package-deploy.yml
index b203ac865..ebc0b5ece 100644
--- a/.github/workflows/python-package-deploy.yml
+++ b/.github/workflows/python-package-deploy.yml
@@ -20,8 +20,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: "0"
+    # PEP 440 beta: 3.0.0b + YYYYMMDDHHMM (UTC). Sortable; no hyphens (invalid in public versions).
     - name: Set version
-      run: echo "VERSION=3.0.0b$(git rev-list 199b6c3..HEAD --count)" >> $GITHUB_ENV
+      run: echo "VERSION=3.0.0b$(date -u +%Y%m%d%H%M)" >> $GITHUB_ENV
     - name: Set up Python 3.11
       uses: actions/setup-python@v5
       with:

From fac7b5c67abe224878601d3f0f31f4360f972098 Mon Sep 17 00:00:00 2001
From: bsteubing <steubing.bernhard@gmail.com>
Date: Sun, 22 Mar 2026 16:00:59 -0500
Subject: [PATCH 2/2] including beta in the automated testing workflow

---
 .github/workflows/testing.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
index ec25e782e..4318f5f90 100644
--- a/.github/workflows/testing.yaml
+++ b/.github/workflows/testing.yaml
@@ -3,9 +3,11 @@ on:
   pull_request:
     branches:
       - major
+      - beta
   push:
     branches:
       - major
+      - beta
 
 jobs:
   tests: