diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index bd33266097..07f14c448c 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -7,9 +7,7 @@ All notable changes to the Zulip server are documented in this file. This section lists notable unreleased changes; it is generally updated in bursts. -### 3.0-rc2 -- July 14, 2020 - -We expect this to become the 3.0 final release in mid July. +### 3.0 -- July 16, 2020 #### Highlights diff --git a/docs/subsystems/release-checklist.md b/docs/subsystems/release-checklist.md index 593077562a..b3255c7e2c 100644 --- a/docs/subsystems/release-checklist.md +++ b/docs/subsystems/release-checklist.md @@ -34,6 +34,8 @@ preparing a new release. * Do final updates to `changelog.md`, for any final changes and with any revisions from the draft blog post. (And the date!) * Update `ZULIP_VERSION` and `LATEST_RELEASE_VERSION` in `version.py`. +* For major releases, update `API_FEATURE_LEVEL` to a feature level + for the final release, and document a reserved range. * Use `build-release-tarball` to generate a final release tarball. * Post the release tarball on https://www.zulip.org/dist/releases/ : add the file, update the `zulip-server-latest.tar.gz` symlink, and diff --git a/templates/zerver/api/changelog.md b/templates/zerver/api/changelog.md index 4e30bfb59c..571ae98e04 100644 --- a/templates/zerver/api/changelog.md +++ b/templates/zerver/api/changelog.md @@ -10,6 +10,10 @@ below features are supported. ## Changes in Zulip 3.0 +**Feature level 25** + +No changes; feature level used for Zulip 3.0 release. + **Feature level 24** * The `!avatar()` and `!gravatar()` markdown syntax, which was never diff --git a/version.py b/version.py index 215ea56247..ca95cb3dbc 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ import os -ZULIP_VERSION = "3.0-rc2+git" +ZULIP_VERSION = "3.0" # Add information on number of commits and commit hash to version, if available zulip_git_version_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'zulip-git-version') if os.path.exists(zulip_git_version_file): @@ -9,9 +9,9 @@ if os.path.exists(zulip_git_version_file): if version: ZULIP_VERSION = version -LATEST_MAJOR_VERSION = "2.1" -LATEST_RELEASE_VERSION = "2.1.7" -LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/12/13/zulip-2-1-released/" +LATEST_MAJOR_VERSION = "3.0" +LATEST_RELEASE_VERSION = "3.0" +LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2020/07/16/zulip-3-0-released/" LATEST_DESKTOP_VERSION = "5.3.0" # Versions of the desktop app below DESKTOP_MINIMUM_VERSION will be @@ -29,7 +29,7 @@ DESKTOP_WARNING_VERSION = "5.2.0" # # Changes should be accompanied by documentation explaining what the # new level means in templates/zerver/api/changelog.md. -API_FEATURE_LEVEL = 24 +API_FEATURE_LEVEL = 25 # Bump the minor PROVISION_VERSION to indicate that folks should provision # only when going from an old version of the code to a newer version. Bump