From c95f048aaa68ecc1cbc7fd289e80f62647fa95ee Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 25 Jul 2024 13:59:17 -0700 Subject: [PATCH] version: Update version after 9.0 release. --- .github/ISSUE_TEMPLATE/2_bug_report.md | 8 ++++---- api_docs/changelog.md | 5 +++++ docs/overview/changelog.md | 21 +++++++++++++++++---- docs/subsystems/release-checklist.md | 4 ++-- version.py | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/2_bug_report.md b/.github/ISSUE_TEMPLATE/2_bug_report.md index 509cfd6edc..eefa3f20d0 100644 --- a/.github/ISSUE_TEMPLATE/2_bug_report.md +++ b/.github/ISSUE_TEMPLATE/2_bug_report.md @@ -11,8 +11,8 @@ labels: ["bug"] **Zulip Server and web app version:** - [ ] Zulip Cloud (`*.zulipchat.com`) -- [ ] Zulip Server 8.0+ -- [ ] Zulip Server 7.0+ -- [ ] Zulip Server 6.0+ -- [ ] Zulip Server 5.0 or older +- [ ] Zulip Server 9.x +- [ ] Zulip Server 8.x +- [ ] Zulip Server 7.x +- [ ] Zulip Server 6.x or older - [ ] Other or not sure diff --git a/api_docs/changelog.md b/api_docs/changelog.md index 5488586156..a5bb6eff0b 100644 --- a/api_docs/changelog.md +++ b/api_docs/changelog.md @@ -18,6 +18,11 @@ clients should check the `zulip_feature_level` field, present in the /register`](/api/register-queue) responses, to determine the API format used by the Zulip server that they are interacting with. +## Changes in Zulip 10.0 + +Feature levels 278-279 are reserved for future use in 9.x maintenance +releases. + ## Changes in Zulip 9.0 **Feature level 277** diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index 002f49db23..9693ef65e6 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -1,9 +1,21 @@ # Version history -This page contains the release history for the Zulip Server 9.x stable -release series. See the [current Zulip changelog][latest-changelog] -for newer release series, or the [commit log][commit-log] for an -up-to-date list of all changes. +This page contains the release history for the Zulip server. See also the +[Zulip release lifecycle](../overview/release-lifecycle.md). + +## Zulip Server 10.x series (development) + +This section is an incomplete draft of the release notes for the next +major release, and is only updated occasionally. See the [commit +log][commit-log] for an up-to-date list of all changes. + +### Zulip Server 10.0 + +_Unreleased_ + +#### Upgrade notes for 10.0 + +- None yet. ## Zulip Server 9.x series @@ -4110,6 +4122,7 @@ _Released 2015-10-19_ This section links to the upgrade notes from past releases, so you can easily read them all when upgrading across multiple releases. +- [Draft upgrade notes for 10.0](#upgrade-notes-for-100) - [Upgrade notes for 9.0](#upgrade-notes-for-90) - [Upgrade notes for 8.0](#upgrade-notes-for-80) - [Upgrade notes for 7.0](#upgrade-notes-for-70) diff --git a/docs/subsystems/release-checklist.md b/docs/subsystems/release-checklist.md index 6acf44dc24..ff21a97974 100644 --- a/docs/subsystems/release-checklist.md +++ b/docs/subsystems/release-checklist.md @@ -103,8 +103,8 @@ preparing a new release. to both zulip.git and zulip-internal.git to get a correct version number for future Cloud deployments. - Add the new release to `.github/ISSUE_TEMPLATE/2_bug_report.md`. - - Consider removing a few old releases from ReadTheDocs; we keep about - two years of back-versions. + - Consider removing a few old releases from the issue template and + ReadTheDocs; we keep about two years of back-versions. - Update Transifex to add the new `4.x` style release branch resources and archive the previous release branch's resources with the "Translations can't translate this resource" setting. diff --git a/version.py b/version.py index 37311a2d3e..fcc0342346 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ import os -ZULIP_VERSION = "9.0" +ZULIP_VERSION = "10.0-dev+git" # Add information on number of commits and commit hash to version, if available zulip_git_version_file = os.path.join(